diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-11 17:55:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-11 17:55:42 +0200 |
| commit | 940010c5a314a7bd9b498593bc6ba1718ac5aec5 (patch) | |
| tree | d141e08ced08c40c6a8e3ab2cdecde5ff14e560f /arch/x86/vdso | |
| parent | 8dc8e5e8bc0ce00b0f656bf972f67cd8a72759e5 (diff) | |
| parent | 991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d (diff) | |
Merge branch 'linus' into perfcounters/core
Conflicts:
arch/x86/kernel/irqinit.c
arch/x86/kernel/irqinit_64.c
arch/x86/kernel/traps.c
arch/x86/mm/fault.c
include/linux/sched.h
kernel/exit.c
Diffstat (limited to 'arch/x86/vdso')
| -rw-r--r-- | arch/x86/vdso/vma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c index 93b7a2938b2f..21e1aeb9f3ea 100644 --- a/arch/x86/vdso/vma.c +++ b/arch/x86/vdso/vma.c @@ -8,6 +8,7 @@ #include <linux/sched.h> #include <linux/init.h> #include <linux/random.h> +#include <linux/elf.h> #include <asm/vsyscall.h> #include <asm/vgtod.h> #include <asm/proto.h> |