diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-23 07:26:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-23 07:26:27 -0400 |
| commit | 101d5b713700b902b1c200cdd1925c3cb7d34567 (patch) | |
| tree | a0d4b4140129ad2f24fd17b965dfcfbbb1ac01db /include/asm-x86/vdso.h | |
| parent | cec5eb7be3a104fffd27ca967ee8e15a123050e2 (diff) | |
| parent | e6babb6b7fed93c93f8fc5ef8ebd3a474fc2df3e (diff) | |
Merge branch 'x86/signal' into core/signal
Conflicts:
arch/x86/kernel/cpu/feature_names.c
arch/x86/kernel/setup.c
drivers/pci/intel-iommu.c
include/asm-x86/cpufeature.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/vdso.h')
| -rw-r--r-- | include/asm-x86/vdso.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/vdso.h b/include/asm-x86/vdso.h index 8e18fb80f5e6..4ab320913ea3 100644 --- a/include/asm-x86/vdso.h +++ b/include/asm-x86/vdso.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _ASM_X86_VDSO_H | 1 | #ifndef ASM_X86__VDSO_H |
| 2 | #define _ASM_X86_VDSO_H 1 | 2 | #define ASM_X86__VDSO_H |
| 3 | 3 | ||
| 4 | #ifdef CONFIG_X86_64 | 4 | #ifdef CONFIG_X86_64 |
| 5 | extern const char VDSO64_PRELINK[]; | 5 | extern const char VDSO64_PRELINK[]; |
| @@ -44,4 +44,4 @@ extern const char vdso32_int80_start, vdso32_int80_end; | |||
| 44 | extern const char vdso32_syscall_start, vdso32_syscall_end; | 44 | extern const char vdso32_syscall_start, vdso32_syscall_end; |
| 45 | extern const char vdso32_sysenter_start, vdso32_sysenter_end; | 45 | extern const char vdso32_sysenter_start, vdso32_sysenter_end; |
| 46 | 46 | ||
| 47 | #endif /* asm-x86/vdso.h */ | 47 | #endif /* ASM_X86__VDSO_H */ |