summaryrefslogtreecommitdiff
path: root/include/asm-x86/rwsem.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-06 16:15:57 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-06 16:15:57 +0200
commitb8cd9d056bbc5f2630ab1787dbf76f83bbb517c0 (patch)
treea49c776b88db5346eaef6082c271f5d79319654f /include/asm-x86/rwsem.h
parentfec6ed1d1f9b78a6acb4a3eb2c46c812ac2e96f0 (diff)
parent1503af661947b7a4a09355cc2ae6aa0d43f16776 (diff)
Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1
Conflicts: include/asm-x86/dma-mapping.h include/asm-x86/gpio.h include/asm-x86/idle.h include/asm-x86/kvm_host.h include/asm-x86/namei.h include/asm-x86/uaccess.h Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/rwsem.h')
-rw-r--r--include/asm-x86/rwsem.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/rwsem.h b/include/asm-x86/rwsem.h
index 750f2a3542b3..3ff3015b71a8 100644
--- a/include/asm-x86/rwsem.h
+++ b/include/asm-x86/rwsem.h
@@ -29,8 +29,8 @@
* front, then they'll all be woken up, but no other readers will be.
*/
-#ifndef _I386_RWSEM_H
-#define _I386_RWSEM_H
+#ifndef ASM_X86__RWSEM_H
+#define ASM_X86__RWSEM_H
#ifndef _LINUX_RWSEM_H
#error "please don't include asm/rwsem.h directly, use linux/rwsem.h instead"
@@ -262,4 +262,4 @@ static inline int rwsem_is_locked(struct rw_semaphore *sem)
}
#endif /* __KERNEL__ */
-#endif /* _I386_RWSEM_H */
+#endif /* ASM_X86__RWSEM_H */