diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 03:02:06 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 03:02:06 +0400 |
| commit | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (patch) | |
| tree | 8a3ff82f4b7ae26df4f7c8b4c852748f7533a418 /arch | |
| parent | dcbb5593d980bbf4ceef320f8c75210398ed84db (diff) | |
| parent | 5ac7687860dbfd3dd90e09d2c10dd31de91f20c2 (diff) | |
| download | linux-ebc79c4f8da0f92efa968e0328f32334a2ce80cf.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6:
includecheck fix: x86, cpu/common.c
includecheck fix: kernel/trace, ring_buffer.c
includecheck fix: include/linux, ftrace.h
includecheck fix: include/linux, page_cgroup.h
includecheck fix: include/linux, aio.h
includecheck fix: include/drm, drm_memory.h
includecheck fix: include/acpi, acpi_bus.h
includecheck fix: drivers/xen, evtchn.c
includecheck fix: drivers/video, vgacon.c
includecheck fix: drivers/scsi, ibmvscsi.c
includecheck fix: drivers/scsi, libfcoe.c
includecheck fix: x86, shadow.c
includecheck fix: x86, traps.c
includecheck fix: um, helper.c
includecheck fix: s390, sys_s390.c
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/kernel/sys_s390.c | 1 | ||||
| -rw-r--r-- | arch/um/os-Linux/helper.c | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/common.c | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/traps.c | 1 | ||||
| -rw-r--r-- | arch/x86/mm/kmemcheck/shadow.c | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c index c7ae4b17e0e3..e9d94f61d500 100644 --- a/arch/s390/kernel/sys_s390.c +++ b/arch/s390/kernel/sys_s390.c @@ -29,7 +29,6 @@ #include <linux/personality.h> #include <linux/unistd.h> #include <linux/ipc.h> -#include <linux/syscalls.h> #include <asm/uaccess.h> #include "entry.h" diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c index 30860b89ec58..b6b1096152aa 100644 --- a/arch/um/os-Linux/helper.c +++ b/arch/um/os-Linux/helper.c @@ -15,7 +15,6 @@ #include "os.h" #include "um_malloc.h" #include "user.h" -#include <linux/limits.h> struct helper_data { void (*pre_exec)(void*); diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 2055fc2b2e6b..2fea97eccf77 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -34,7 +34,6 @@ #include <asm/mce.h> #include <asm/msr.h> #include <asm/pat.h> -#include <linux/smp.h> #ifdef CONFIG_X86_LOCAL_APIC #include <asm/uv/uv.h> diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 7dc0de9d1ed9..9346e102338d 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -65,7 +65,6 @@ #else #include <asm/processor-flags.h> #include <asm/setup.h> -#include <asm/traps.h> asmlinkage int system_call(void); diff --git a/arch/x86/mm/kmemcheck/shadow.c b/arch/x86/mm/kmemcheck/shadow.c index e773b6bd0079..3f66b82076a3 100644 --- a/arch/x86/mm/kmemcheck/shadow.c +++ b/arch/x86/mm/kmemcheck/shadow.c @@ -1,7 +1,6 @@ #include <linux/kmemcheck.h> #include <linux/module.h> #include <linux/mm.h> -#include <linux/module.h> #include <asm/page.h> #include <asm/pgtable.h> |