includecheck fixes
Subsystems (20)
Linus,
Please pull includecheck fixes.
The following changes since commit 78f28b7c555359c67c2a0d23f7436e915329421e:
Linus Torvalds (1):
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6.git master
Jaswinder Singh Rajput (15):
includecheck fix: s390, sys_s390.c includecheck fix: um, helper.c includecheck fix: x86, traps.c includecheck fix: x86, shadow.c includecheck fix: drivers/scsi, libfcoe.c includecheck fix: drivers/scsi, ibmvscsi.c includecheck fix: drivers/video, vgacon.c includecheck fix: drivers/xen, evtchn.c includecheck fix: include/acpi, acpi_bus.h includecheck fix: include/drm, drm_memory.h includecheck fix: include/linux, aio.h includecheck fix: include/linux, page_cgroup.h includecheck fix: include/linux, ftrace.h includecheck fix: kernel/trace, ring_buffer.c includecheck fix: x86, cpu/common.c
arch/s390/kernel/sys_s390.c | 1 - arch/um/os-Linux/helper.c | 1 - arch/x86/kernel/cpu/common.c | 1 - arch/x86/kernel/traps.c | 1 - arch/x86/mm/kmemcheck/shadow.c | 1 - drivers/scsi/fcoe/libfcoe.c | 1 - drivers/scsi/ibmvscsi/ibmvscsi.c | 1 - drivers/video/console/vgacon.c | 1 - drivers/xen/evtchn.c | 1 - include/acpi/acpi_bus.h | 1 - include/drm/drm_memory.h | 2 -- include/linux/aio.h | 2 -- include/linux/ftrace.h | 1 - include/linux/page_cgroup.h | 4 ++-- kernel/trace/ring_buffer.c | 2 -- 15 files changed, 2 insertions(+), 19 deletions(-)
arch/s390/kernel/sys_s390.c +0 -1
@@ -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"
arch/um/os-Linux/helper.c +0 -1
@@ -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 *);
arch/x86/kernel/cpu/common.c +0 -1
@@ -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>
arch/x86/kernel/traps.c +0 -1
@@ -65,7 +65,6 @@#else #include <asm/processor-flags.h> #include <asm/setup.h> -#include <asm/traps.h> asmlinkage int system_call(void);
arch/x86/mm/kmemcheck/shadow.c +0 -1
@@ -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>
drivers/scsi/fcoe/libfcoe.c +0 -1
@@ -29,7 +29,6 @@#include <linux/ethtool.h> #include <linux/if_ether.h> #include <linux/if_vlan.h> -#include <linux/netdevice.h> #include <linux/errno.h> #include <linux/bitops.h> #include <net/rtnetlink.h>
drivers/scsi/ibmvscsi/ibmvscsi.c +0 -1
@@ -73,7 +73,6 @@#include <linux/of.h> #include <asm/firmware.h> #include <asm/vio.h> -#include <asm/firmware.h> #include <scsi/scsi.h> #include <scsi/scsi_cmnd.h> #include <scsi/scsi_host.h>
drivers/video/console/vgacon.c +0 -1
@@ -180,7 +180,6 @@ static inline void vga_set_mem_top(struct vc_data *c) }#ifdef CONFIG_VGACON_SOFT_SCROLLBACK -#include <linux/slab.h> /* software scrollback */ static void *vgacon_scrollback;static int vgacon_scrollback_tail;
drivers/xen/evtchn.c +0 -1
@@ -38,7 +38,6 @@#include <linux/string.h> #include <linux/errno.h> #include <linux/fs.h> -#include <linux/errno.h> #include <linux/miscdevice.h> #include <linux/major.h> #include <linux/proc_fs.h>
include/acpi/acpi_bus.h +0 -1
@@ -356,7 +356,6 @@ void acpi_remove_dir(struct acpi_device *);/* * Bind physical devices with ACPI devices */ -#include <linux/device.h> struct acpi_bus_type {struct list_head list;struct bus_type *bus;
include/drm/drm_memory.h +0 -2
@@ -44,8 +44,6 @@#if __OS_HAS_AGP -#include <linux/vmalloc.h> -#ifdef HAVE_PAGE_AGP #include <asm/agp.h> #else
include/linux/aio.h +0 -2
@@ -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 <linux/aio_abi.h> -static inline struct kiocb *list_kiocb (struct list_head *h) { return list_entry(h, struct kiocb, ki_list);
include/linux/ftrace.h +0 -1
@@ -446,7 +446,6 @@ static inline void unpause_graph_tracing(void) { }#endif /* CONFIG_FUNCTION_GRAPH_TRACER */ #ifdef CONFIG_TRACING -#include <linux/sched.h> /* flags for current->trace */ enum {
include/linux/page_cgroup.h +2 -2
@@ -105,14 +105,14 @@ static inline void __init page_cgroup_init_flatmem(void)#endif -#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP #include <linux/swap.h> + +#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 <linux/swap.h> static inline unsigned short swap_cgroup_record (swp_entry_t ent,unsigned short id)
kernel/trace/ring_buffer.c +0 -2
@@ -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)