diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/boot/compressed/misc.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/asm-offsets_64.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/syscall_64.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c index 9fea73706479..aaf5a2131efc 100644 --- a/arch/x86/boot/compressed/misc.c +++ b/arch/x86/boot/compressed/misc.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | */ | 16 | */ |
| 17 | #undef CONFIG_PARAVIRT | 17 | #undef CONFIG_PARAVIRT |
| 18 | #ifdef CONFIG_X86_32 | 18 | #ifdef CONFIG_X86_32 |
| 19 | #define _ASM_DESC_H_ 1 | 19 | #define ASM_X86__DESC_H 1 |
| 20 | #endif | 20 | #endif |
| 21 | 21 | ||
| 22 | #ifdef CONFIG_X86_64 | 22 | #ifdef CONFIG_X86_64 |
diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c index aa89387006fe..505543a75a56 100644 --- a/arch/x86/kernel/asm-offsets_64.c +++ b/arch/x86/kernel/asm-offsets_64.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #define __NO_STUBS 1 | 23 | #define __NO_STUBS 1 |
| 24 | #undef __SYSCALL | 24 | #undef __SYSCALL |
| 25 | #undef _ASM_X86_64_UNISTD_H_ | 25 | #undef ASM_X86__UNISTD_64_H |
| 26 | #define __SYSCALL(nr, sym) [nr] = 1, | 26 | #define __SYSCALL(nr, sym) [nr] = 1, |
| 27 | static char syscalls[] = { | 27 | static char syscalls[] = { |
| 28 | #include <asm/unistd.h> | 28 | #include <asm/unistd.h> |
diff --git a/arch/x86/kernel/syscall_64.c b/arch/x86/kernel/syscall_64.c index 170d43c17487..3d1be4f0fac5 100644 --- a/arch/x86/kernel/syscall_64.c +++ b/arch/x86/kernel/syscall_64.c | |||
| @@ -8,12 +8,12 @@ | |||
| 8 | #define __NO_STUBS | 8 | #define __NO_STUBS |
| 9 | 9 | ||
| 10 | #define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ; | 10 | #define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ; |
| 11 | #undef _ASM_X86_64_UNISTD_H_ | 11 | #undef ASM_X86__UNISTD_64_H |
| 12 | #include <asm/unistd_64.h> | 12 | #include <asm/unistd_64.h> |
| 13 | 13 | ||
| 14 | #undef __SYSCALL | 14 | #undef __SYSCALL |
| 15 | #define __SYSCALL(nr, sym) [nr] = sym, | 15 | #define __SYSCALL(nr, sym) [nr] = sym, |
| 16 | #undef _ASM_X86_64_UNISTD_H_ | 16 | #undef ASM_X86__UNISTD_64_H |
| 17 | 17 | ||
| 18 | typedef void (*sys_call_ptr_t)(void); | 18 | typedef void (*sys_call_ptr_t)(void); |
| 19 | 19 | ||
