From 4765d681a4dccdc6ded7dd20329f5498aa53b0d0 Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Sun, 20 Sep 2009 14:38:09 +0530 Subject: [PATCH 01/15] includecheck fix: s390, sys_s390.c fix the following 'make includecheck' warning: arch/s390/kernel/sys_s390.c: linux/syscalls.h is included more than once. Signed-off-by: Jaswinder Singh Rajput Cc: schwidefsky@de.ibm.com Cc: heiko.carstens@de.ibm.com Cc: Sam Ravnborg LKML-Reference: <1247068809.4382.111.camel@ht.satnam> --- arch/s390/kernel/sys_s390.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c index c7ae4b17e0e3d..e9d94f61d5002 100644 --- a/arch/s390/kernel/sys_s390.c +++ b/arch/s390/kernel/sys_s390.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include "entry.h" From edf382bc6d4429d796fc3b26f7a33eaeca9db8ec Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Sun, 20 Sep 2009 14:41:40 +0530 Subject: [PATCH 02/15] includecheck fix: um, helper.c fix the following 'make includecheck' warning: arch/um/os-Linux/helper.c: linux/limits.h is included more than once. Signed-off-by: Jaswinder Singh Rajput Cc: jdike@addtoit.com Cc: Sam Ravnborg LKML-Reference: <1247064950.4382.45.camel@ht.satnam> Acked-by: WANG Cong --- arch/um/os-Linux/helper.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c index 30860b89ec582..b6b1096152aac 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 struct helper_data { void (*pre_exec)(void*); From 144374dcc3ad0436f0a1bb3095836cf0ec32eebe Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Sun, 20 Sep 2009 15:09:26 +0530 Subject: [PATCH 03/15] includecheck fix: x86, traps.c fix the following 'make includecheck' warning: arch/x86/kernel/traps.c: asm/traps.h is included more than once. Signed-off-by: Jaswinder Singh Rajput Cc: Ingo Molnar Cc: Sam Ravnborg LKML-Reference: <1247065094.4382.49.camel@ht.satnam> --- arch/x86/kernel/traps.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 7dc0de9d1ed98..9346e102338df 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -65,7 +65,6 @@ #else #include #include -#include asmlinkage int system_call(void); From fcf989216138858003f0c354698260f29e6e10b0 Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Sun, 20 Sep 2009 15:13:18 +0530 Subject: [PATCH 04/15] includecheck fix: x86, shadow.c fix the following 'make includecheck' warning: arch/x86/mm/kmemcheck/shadow.c: linux/module.h is included more than once. Signed-off-by: Jaswinder Singh Rajput Cc: Ingo Molnar Cc: Sam Ravnborg LKML-Reference: <1247065179.4382.51.camel@ht.satnam> --- arch/x86/mm/kmemcheck/shadow.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/mm/kmemcheck/shadow.c b/arch/x86/mm/kmemcheck/shadow.c index e773b6bd0079b..3f66b82076a31 100644 --- a/arch/x86/mm/kmemcheck/shadow.c +++ b/arch/x86/mm/kmemcheck/shadow.c @@ -1,7 +1,6 @@ #include #include #include -#include #include #include From 39558c8f8e4c48805e702340e1610961d922268a Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Sun, 20 Sep 2009 15:20:55 +0530 Subject: [PATCH 05/15] includecheck fix: drivers/scsi, libfcoe.c fix the following 'make includecheck' warning: drivers/scsi/fcoe/libfcoe.c: linux/netdevice.h is included more than once. Signed-off-by: Jaswinder Singh Rajput Cc: James Bottomley Cc: Sam Ravnborg LKML-Reference: <1247066936.4382.76.camel@ht.satnam> --- drivers/scsi/fcoe/libfcoe.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c index 62a4c20260720..11ae5c94608b2 100644 --- a/drivers/scsi/fcoe/libfcoe.c +++ b/drivers/scsi/fcoe/libfcoe.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include From 98840f2ce5339d46e1830b0455360ad03a840d9d Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Sun, 20 Sep 2009 15:23:00 +0530 Subject: [PATCH 06/15] includecheck fix: drivers/scsi, ibmvscsi.c fix the following 'make includecheck' warning: drivers/scsi/ibmvscsi/ibmvscsi.c: asm/firmware.h is included more than once. Signed-off-by: Jaswinder Singh Rajput Cc: James Bottomley Cc: Sam Ravnborg LKML-Reference: <1247067016.4382.78.camel@ht.satnam> Acked-by: Brian King --- drivers/scsi/ibmvscsi/ibmvscsi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c index 9928704e235f4..d9b0e9d319830 100644 --- a/drivers/scsi/ibmvscsi/ibmvscsi.c +++ b/drivers/scsi/ibmvscsi/ibmvscsi.c @@ -73,7 +73,6 @@ #include #include #include -#include #include #include #include From 6d6c971778c5257fc815e1ebe01779fefda6293c Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Sun, 20 Sep 2009 15:28:01 +0530 Subject: [PATCH 07/15] includecheck fix: drivers/video, vgacon.c fix the following 'make includecheck' warning: drivers/video/console/vgacon.c: linux/slab.h is included more than once. Signed-off-by: Jaswinder Singh Rajput Cc: Martin Mares Cc: mchehab@infradead.org Cc: Sam Ravnborg LKML-Reference: <1247067624.4382.88.camel@ht.satnam> --- drivers/video/console/vgacon.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c index 59d7d5ec17a4e..74e96cf83b7e7 100644 --- a/drivers/video/console/vgacon.c +++ b/drivers/video/console/vgacon.c @@ -180,7 +180,6 @@ static inline void vga_set_mem_top(struct vc_data *c) } #ifdef CONFIG_VGACON_SOFT_SCROLLBACK -#include /* software scrollback */ static void *vgacon_scrollback; static int vgacon_scrollback_tail; From 56327c2a58b76291616f15c9c84a180cf7049645 Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Sun, 20 Sep 2009 15:41:10 +0530 Subject: [PATCH 08/15] includecheck fix: drivers/xen, evtchn.c fix the following 'make includecheck' warning: drivers/xen/evtchn.c: linux/errno.h is included more than once. Signed-off-by: Jaswinder Singh Rajput Cc: chrisw@sous-sol.org Cc: Sam Ravnborg LKML-Reference: <1247067749.4382.90.camel@ht.satnam> Acked-by: Jeremy Fitzhardinge --- drivers/xen/evtchn.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c index af031950f9b1a..79bedba44feef 100644 --- a/drivers/xen/evtchn.c +++ b/drivers/xen/evtchn.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include From b21495a03e20514eacd788a6b5d160667177cd94 Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Sun, 20 Sep 2009 15:48:42 +0530 Subject: [PATCH 09/15] includecheck fix: include/acpi, acpi_bus.h fix the following 'make includecheck' warning: include/acpi/acpi_bus.h: linux/device.h is included more than once. Signed-off-by: Jaswinder Singh Rajput Cc: Sam Ravnborg LKML-Reference: <1247068058.4382.96.camel@ht.satnam> Acked-by: Len Brown --- include/acpi/acpi_bus.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 1fa3ffb7c93b2..1b3b36068ca55 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -356,7 +356,6 @@ void acpi_remove_dir(struct acpi_device *); /* * Bind physical devices with ACPI devices */ -#include struct acpi_bus_type { struct list_head list; struct bus_type *bus; From 067006a5f5b956fbdd183f9b799e7b8059b53f6c Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Sun, 20 Sep 2009 15:53:25 +0530 Subject: [PATCH 10/15] includecheck fix: include/drm, drm_memory.h fix the following 'make includecheck' warning: include/drm/drm_memory.h: linux/vmalloc.h is included more than once. Signed-off-by: Jaswinder Singh Rajput Cc: Sam Ravnborg LKML-Reference: <1247068169.4382.99.camel@ht.satnam> Acked-by: Dave Airlie --- include/drm/drm_memory.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/drm/drm_memory.h b/include/drm/drm_memory.h index 63e425b5ea82a..15af9b32ae42d 100644 --- a/include/drm/drm_memory.h +++ b/include/drm/drm_memory.h @@ -44,8 +44,6 @@ #if __OS_HAS_AGP -#include - #ifdef HAVE_PAGE_AGP #include #else From 43cc960980760f58d1f49ecd39e8cbfb063d63e1 Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Sun, 20 Sep 2009 16:09:20 +0530 Subject: [PATCH 11/15] includecheck fix: include/linux, aio.h fix the following 'make includecheck' warning: include/linux/aio.h: linux/aio_abi.h is included more than once. Signed-off-by: Jaswinder Singh Rajput Cc: bcrl@kvack.org Cc: Sam Ravnborg LKML-Reference: <1247068254.4382.101.camel@ht.satnam> --- include/linux/aio.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/linux/aio.h b/include/linux/aio.h index 47f7d932a01d5..aea219d7d8d1a 100644 --- a/include/linux/aio.h +++ b/include/linux/aio.h @@ -225,8 +225,6 @@ static inline void exit_aio(struct mm_struct *mm) { } #define io_wait_to_kiocb(wait) container_of(wait, struct kiocb, ki_wait) -#include - static inline struct kiocb *list_kiocb(struct list_head *h) { return list_entry(h, struct kiocb, ki_list); From 97572751d78133cf9a5f7165b252bf975f9dd17d Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Sun, 20 Sep 2009 16:20:44 +0530 Subject: [PATCH 12/15] includecheck fix: include/linux, page_cgroup.h fix the following 'make includecheck' warning: include/linux/page_cgroup.h: linux/swap.h is included more than once. Signed-off-by: Jaswinder Singh Rajput Cc: Li Zefan Acked-by: Paul Menage --- include/linux/page_cgroup.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/page_cgroup.h b/include/linux/page_cgroup.h index 13f126c89ae8f..ada779f241784 100644 --- a/include/linux/page_cgroup.h +++ b/include/linux/page_cgroup.h @@ -105,14 +105,14 @@ static inline void __init page_cgroup_init_flatmem(void) #endif -#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP #include + +#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP extern unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id); extern unsigned short lookup_swap_cgroup(swp_entry_t ent); extern int swap_cgroup_swapon(int type, unsigned long max_pages); extern void swap_cgroup_swapoff(int type); #else -#include static inline unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id) From 83ba7c34d2b82dc608647f629616df393ab883f9 Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Sun, 20 Sep 2009 16:24:00 +0530 Subject: [PATCH 13/15] includecheck fix: include/linux, ftrace.h fix the following 'make includecheck' warning: include/linux/ftrace.h: linux/sched.h is included more than once. Signed-off-by: Jaswinder Singh Rajput Cc: Steven Rostedt Cc: Ingo Molnar Cc: Sam Ravnborg LKML-Reference: <1247068321.4382.102.camel@ht.satnam> --- include/linux/ftrace.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index dc3b1328aaeb6..3c0924a18dafd 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -446,7 +446,6 @@ static inline void unpause_graph_tracing(void) { } #endif /* CONFIG_FUNCTION_GRAPH_TRACER */ #ifdef CONFIG_TRACING -#include /* flags for current->trace */ enum { From a0f320f48799f67329fcb1b26ff0451c304e1dde Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Sun, 20 Sep 2009 16:31:16 +0530 Subject: [PATCH 14/15] includecheck fix: kernel/trace, ring_buffer.c fix the following 'make includecheck' warning: kernel/trace/ring_buffer.c: trace.h is included more than once. Signed-off-by: Jaswinder Singh Rajput Cc: Steven Rostedt Cc: Ingo Molnar Cc: Sam Ravnborg LKML-Reference: <1247068617.4382.107.camel@ht.satnam> --- kernel/trace/ring_buffer.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 6eef38923b07e..d4ff01970547a 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -201,8 +201,6 @@ int tracing_is_on(void) } EXPORT_SYMBOL_GPL(tracing_is_on); -#include "trace.h" - #define RB_EVNT_HDR_SIZE (offsetof(struct ring_buffer_event, array)) #define RB_ALIGNMENT 4U #define RB_MAX_SMALL_DATA (RB_ALIGNMENT * RINGBUF_TYPE_DATA_TYPE_LEN_MAX) From 5ac7687860dbfd3dd90e09d2c10dd31de91f20c2 Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Sun, 20 Sep 2009 16:34:24 +0530 Subject: [PATCH 15/15] includecheck fix: x86, cpu/common.c fix the following 'make includecheck' warning: arch/x86/kernel/cpu/common.c: linux/smp.h is included more than once. Signed-off-by: Jaswinder Singh Rajput Cc: Alan Cox Cc: Ingo Molnar LKML-Reference: <1252087783.6385.10.camel@ht.satnam> --- arch/x86/kernel/cpu/common.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 2055fc2b2e6b8..2fea97eccf772 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -34,7 +34,6 @@ #include #include #include -#include #ifdef CONFIG_X86_LOCAL_APIC #include