diff options
author | Vegard Nossum <vegard.nossum@gmail.com> | 2008-07-22 15:53:53 -0400 |
---|---|---|
committer | Vegard Nossum <vegard.nossum@gmail.com> | 2008-07-22 15:53:53 -0400 |
commit | a31863168660c6b6f6c7ffe05bb6a38e97803326 (patch) | |
tree | f027f581a10302504520809d1d45293595bc849e /include | |
parent | 77ef50a522717fa040636ee1017179ceba12ff62 (diff) |
x86: consolidate header guards
This patch consolidates the header guard names which are also used
externally, i.e. in .c files.
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-x86/desc.h | 6 | ||||
-rw-r--r-- | include/asm-x86/unistd_64.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h index a44c4dc70590..b73fea54def2 100644 --- a/include/asm-x86/desc.h +++ b/include/asm-x86/desc.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef _ASM_DESC_H_ | 1 | #ifndef ASM_X86__DESC_H |
2 | #define _ASM_DESC_H_ | 2 | #define ASM_X86__DESC_H |
3 | 3 | ||
4 | #ifndef __ASSEMBLY__ | 4 | #ifndef __ASSEMBLY__ |
5 | #include <asm/desc_defs.h> | 5 | #include <asm/desc_defs.h> |
@@ -397,4 +397,4 @@ static inline void set_system_gate_ist(int n, void *addr, unsigned ist) | |||
397 | 397 | ||
398 | #endif /* __ASSEMBLY__ */ | 398 | #endif /* __ASSEMBLY__ */ |
399 | 399 | ||
400 | #endif | 400 | #endif /* ASM_X86__DESC_H */ |
diff --git a/include/asm-x86/unistd_64.h b/include/asm-x86/unistd_64.h index 9c1a4a3470d9..1e10189ed6b0 100644 --- a/include/asm-x86/unistd_64.h +++ b/include/asm-x86/unistd_64.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef _ASM_X86_64_UNISTD_H_ | 1 | #ifndef ASM_X86__UNISTD_64_H |
2 | #define _ASM_X86_64_UNISTD_H_ | 2 | #define ASM_X86__UNISTD_64_H |
3 | 3 | ||
4 | #ifndef __SYSCALL | 4 | #ifndef __SYSCALL |
5 | #define __SYSCALL(a, b) | 5 | #define __SYSCALL(a, b) |
@@ -676,4 +676,4 @@ __SYSCALL(__NR_timerfd_gettime, sys_timerfd_gettime) | |||
676 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") | 676 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") |
677 | #endif /* __KERNEL__ */ | 677 | #endif /* __KERNEL__ */ |
678 | 678 | ||
679 | #endif /* _ASM_X86_64_UNISTD_H_ */ | 679 | #endif /* ASM_X86__UNISTD_64_H */ |