From 1d46b834aa46ec3b548858494b639474a37c4e51 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@linux.intel.com>
Date: Fri, 21 Sep 2012 12:43:09 -0700
Subject: [PATCH] --- yaml --- r: 326234 b: refs/heads/master c:
 76f30759f690db21ca567a20665ed2679ad3235b h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/x86/include/asm/alternative-asm.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5fb745f0414b..235ca5564557 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cebed423c84a56b871327dd77e555d1d2186a6b
+refs/heads/master: 76f30759f690db21ca567a20665ed2679ad3235b
diff --git a/trunk/arch/x86/include/asm/alternative-asm.h b/trunk/arch/x86/include/asm/alternative-asm.h
index 018d29fe634a..372231c22a47 100644
--- a/trunk/arch/x86/include/asm/alternative-asm.h
+++ b/trunk/arch/x86/include/asm/alternative-asm.h
@@ -1,3 +1,6 @@
+#ifndef _ASM_X86_ALTERNATIVE_ASM_H
+#define _ASM_X86_ALTERNATIVE_ASM_H
+
 #ifdef __ASSEMBLY__
 
 #include <asm/asm.h>
@@ -24,3 +27,5 @@
 .endm
 
 #endif  /*  __ASSEMBLY__  */
+
+#endif /* _ASM_X86_ALTERNATIVE_ASM_H */