git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1
[sfrench/cifs-2.6.git]
/
include
/
asm-x86
/
percpu.h
diff --git
a/include/asm-x86/percpu.h
b/include/asm-x86/percpu.h
index f643a3a92da08b3789efde09f883850f0e85b0ac..e10a1d0678cfaa014ad702e1169e5d7417240f52 100644
(file)
--- a/
include/asm-x86/percpu.h
+++ b/
include/asm-x86/percpu.h
@@
-1,5
+1,5
@@
-#ifndef
_ASM_X86_PERCPU_H_
-#define
_ASM_X86_PERCPU_H_
+#ifndef
ASM_X86__PERCPU_H
+#define
ASM_X86__PERCPU_H
#ifdef CONFIG_X86_64
#include <linux/compiler.h>
@@
-215,4
+215,4
@@
do { \
#endif /* !CONFIG_SMP */
-#endif /*
_ASM_X86_PERCPU_H_
*/
+#endif /*
ASM_X86__PERCPU_H
*/