| From: "H. Peter Anvin" <hpa@linux.intel.com> |
| Date: Fri, 21 Sep 2012 12:43:09 -0700 |
| Subject: x86, alternative: Add header guards to <asm/alternative-asm.h> |
| |
| commit 76f30759f690db21ca567a20665ed2679ad3235b upstream. |
| |
| Add header guards to protect <asm/alternative-asm.h> against multiple |
| inclusion. |
| |
| Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> |
| Link: http://lkml.kernel.org/r/1348256595-29119-6-git-send-email-hpa@linux.intel.com |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| arch/x86/include/asm/alternative-asm.h | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| --- a/arch/x86/include/asm/alternative-asm.h |
| +++ b/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> |
| @@ -65,3 +68,5 @@ |
| .endm |
| |
| #endif /* __ASSEMBLY__ */ |
| + |
| +#endif /* _ASM_X86_ALTERNATIVE_ASM_H */ |
