Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm...

Pull "Disintegrate and delete asm/system.h" from David Howells:
 "Here are a bunch of patches to disintegrate asm/system.h into a set of
  separate bits to relieve the problem of circular inclusion
  dependencies.

  I've built all the working defconfigs from all the arches that I can
  and made sure that they don't break.

  The reason for these patches is that I recently encountered a circular
  dependency problem that came about when I produced some patches to
  optimise get_order() by rewriting it to use ilog2().

  This uses bitops - and on the SH arch asm/bitops.h drags in
  asm-generic/get_order.h by a circuituous route involving asm/system.h.

  The main difficulty seems to be asm/system.h.  It holds a number of
  low level bits with no/few dependencies that are commonly used (eg.
  memory barriers) and a number of bits with more dependencies that
  aren't used in many places (eg.  switch_to()).

  These patches break asm/system.h up into the following core pieces:

    (1) asm/barrier.h

        Move memory barriers here.  This already done for MIPS and Alpha.

    (2) asm/switch_to.h

        Move switch_to() and related stuff here.

    (3) asm/exec.h

        Move arch_align_stack() here.  Other process execution related bits
        could perhaps go here from asm/processor.h.

    (4) asm/cmpxchg.h

        Move xchg() and cmpxchg() here as they're full word atomic ops and
        frequently used by atomic_xchg() and atomic_cmpxchg().

    (5) asm/bug.h

        Move die() and related bits.

    (6) asm/auxvec.h

        Move AT_VECTOR_SIZE_ARCH here.

  Other arch headers are created as needed on a per-arch basis."

Fixed up some conflicts from other header file cleanups and moving code
around that has happened in the meantime, so David's testing is somewhat
weakened by that.  We'll find out anything that got broken and fix it..

* tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system: (38 commits)
  Delete all instances of asm/system.h
  Remove all #inclusions of asm/system.h
  Add #includes needed to permit the removal of asm/system.h
  Move all declarations of free_initmem() to linux/mm.h
  Disintegrate asm/system.h for OpenRISC
  Split arch_align_stack() out from asm-generic/system.h
  Split the switch_to() wrapper out of asm-generic/system.h
  Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h
  Create asm-generic/barrier.h
  Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h
  Disintegrate asm/system.h for Xtensa
  Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt]
  Disintegrate asm/system.h for Tile
  Disintegrate asm/system.h for Sparc
  Disintegrate asm/system.h for SH
  Disintegrate asm/system.h for Score
  Disintegrate asm/system.h for S390
  Disintegrate asm/system.h for PowerPC
  Disintegrate asm/system.h for PA-RISC
  Disintegrate asm/system.h for MN10300
  ...

diff --cc arch/alpha/kernel/sys_marvel.c
Simple merge

diff --cc arch/alpha/kernel/sys_titan.c
Simple merge

diff --cc arch/arm/include/asm/system_misc.h
index 0000000,9e65b23..5a85f14
mode 000000,100644..100644
--- /dev/null
--- 2/arch/arm/include/asm/system_misc.h
+++ b/arch/arm/include/asm/system_misc.h
@@@ -1,0 -1,28 +1,29 @@@
+ #ifndef __ASM_ARM_SYSTEM_MISC_H
+ #define __ASM_ARM_SYSTEM_MISC_H
+ 
+ #ifndef __ASSEMBLY__
+ 
+ #include <linux/compiler.h>
+ #include <linux/linkage.h>
+ #include <linux/irqflags.h>
+ 
+ extern void cpu_init(void);
+ 
+ void soft_restart(unsigned long);
+ extern void (*arm_pm_restart)(char str, const char *cmd);
++extern void (*arm_pm_idle)(void);
+ 
+ #define UDBG_UNDEFINED        (1 << 0)
+ #define UDBG_SYSCALL  (1 << 1)
+ #define UDBG_BADABORT (1 << 2)
+ #define UDBG_SEGV     (1 << 3)
+ #define UDBG_BUS      (1 << 4)
+ 
+ extern unsigned int user_debug;
+ 
+ extern void disable_hlt(void);
+ extern void enable_hlt(void);
+ 
+ #endif /* !__ASSEMBLY__ */
+ 
+ #endif /* __ASM_ARM_SYSTEM_MISC_H */

diff --cc arch/arm/kernel/entry-armv.S
Simple merge

diff --cc arch/arm/kernel/process.c
Simple merge

diff --cc arch/arm/mach-at91/at91rm9200.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9260.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9261.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9263.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9g45.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9rl.c
Simple merge

diff --cc arch/arm/mach-clps711x/common.c
Simple merge

diff --cc arch/arm/mach-ebsa110/core.c
Simple merge

diff --cc arch/arm/mach-ebsa110/leds.c
index d43121a,101a320..99e14e3
--- 1/arch/arm/mach-ebsa110/leds.c
--- 2/arch/arm/mach-ebsa110/leds.c
+++ b/arch/arm/mach-ebsa110/leds.c
@@@ -17,11 -17,8 +17,10 @@@
  
  #include <mach/hardware.h>
  #include <asm/leds.h>
- #include <asm/system.h>
  #include <asm/mach-types.h>
  
 +#include "core.h"
 +
  static spinlock_t leds_lock;
  
  static void ebsa110_leds_event(led_event_t ledevt)

diff --cc arch/arm/mach-footbridge/dc21285.c
Simple merge

diff --cc arch/arm/mach-imx/mach-imx6q.c
Simple merge

diff --cc arch/arm/mach-integrator/core.c
Simple merge

diff --cc arch/arm/mach-integrator/pci_v3.c
Simple merge

diff --cc arch/arm/mach-ixp2000/ixdp2400.c
Simple merge

diff --cc arch/arm/mach-ixp2000/ixdp2800.c
Simple merge

diff --cc arch/arm/mach-ixp2000/ixdp2x00.c
Simple merge

diff --cc arch/arm/mach-ixp2000/pci.c
Simple merge

diff --cc arch/arm/mach-ixp23xx/core.c
Simple merge

diff --cc arch/arm/mach-ixp23xx/pci.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/common-pci.c
Simple merge

diff --cc arch/arm/mach-mmp/pxa168.c
Simple merge

diff --cc arch/arm/mach-mxs/system.c
Simple merge

diff --cc arch/arm/mach-omap1/id.c
index f24c1e2,b3f3363..2b28e1d
--- 1/arch/arm/mach-omap1/id.c
--- 2/arch/arm/mach-omap1/id.c
+++ b/arch/arm/mach-omap1/id.c
@@@ -15,11 -15,9 +15,12 @@@
  #include <linux/kernel.h>
  #include <linux/init.h>
  #include <linux/io.h>
+ #include <asm/system_info.h>
 +
  #include <plat/cpu.h>
  
 +#include <mach/hardware.h>
 +
  #define OMAP_DIE_ID_0         0xfffe1800
  #define OMAP_DIE_ID_1         0xfffe1804
  #define OMAP_PRODUCTION_ID_0  0xfffe2000

diff --cc arch/arm/mach-omap1/time.c
index 2fae6a2,7595e0a..4d8dd9a
--- 1/arch/arm/mach-omap1/time.c
--- 2/arch/arm/mach-omap1/time.c
+++ b/arch/arm/mach-omap1/time.c
@@@ -44,7 -44,7 +44,6 @@@
  #include <linux/clockchips.h>
  #include <linux/io.h>
  
- #include <asm/system.h>
 -#include <mach/hardware.h>
  #include <asm/leds.h>
  #include <asm/irq.h>
  #include <asm/sched_clock.h>

diff --cc arch/arm/mach-omap1/timer32k.c
index a2e6d07,10bcd13..325b9a0
--- 1/arch/arm/mach-omap1/timer32k.c
--- 2/arch/arm/mach-omap1/timer32k.c
+++ b/arch/arm/mach-omap1/timer32k.c
@@@ -46,7 -46,7 +46,6 @@@
  #include <linux/clockchips.h>
  #include <linux/io.h>
  
- #include <asm/system.h>
 -#include <mach/hardware.h>
  #include <asm/leds.h>
  #include <asm/irq.h>
  #include <asm/mach/irq.h>

diff --cc arch/arm/mach-omap2/board-omap3touchbook.c
Simple merge

diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
Simple merge

diff --cc arch/arm/mach-omap2/mux.c
Simple merge

diff --cc arch/arm/mach-omap2/omap-mpuss-lowpower.c
Simple merge

diff --cc arch/arm/mach-omap2/pm24xx.c
index 5ca45ca,730bb00..95442b6
--- 1/arch/arm/mach-omap2/pm24xx.c
--- 2/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@@ -33,7 -34,9 +33,8 @@@
  #include <asm/mach/time.h>
  #include <asm/mach/irq.h>
  #include <asm/mach-types.h>
+ #include <asm/system_misc.h>
  
 -#include <mach/irqs.h>
  #include <plat/clock.h>
  #include <plat/sram.h>
  #include <plat/dma.h>

diff --cc arch/arm/mach-omap2/pm34xx.c
Simple merge

diff --cc arch/arm/mach-omap2/pm44xx.c
Simple merge

diff --cc arch/arm/mach-pxa/magician.c
Simple merge

diff --cc arch/arm/mach-rpc/riscpc.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/s3c2410.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/s3c2412.c
index c6eac98,100ef1c..d4bc7f9
--- 1/arch/arm/mach-s3c24xx/s3c2412.c
--- 2/arch/arm/mach-s3c2412/s3c2412.c
+++ b/arch/arm/mach-s3c24xx/s3c2412.c
@@@ -31,7 -31,10 +31,8 @@@
  #include <mach/hardware.h>
  #include <asm/proc-fns.h>
  #include <asm/irq.h>
+ #include <asm/system_misc.h>
  
 -#include <mach/idle.h>
 -
  #include <plat/cpu-freq.h>
  
  #include <mach/regs-clock.h>

diff --cc arch/arm/mach-s3c24xx/s3c2416.c
index 0e9a71c,ed67ec9..7743fad
--- 1/arch/arm/mach-s3c24xx/s3c2416.c
--- 2/arch/arm/mach-s3c2416/s3c2416.c
+++ b/arch/arm/mach-s3c24xx/s3c2416.c
@@@ -43,7 -43,9 +43,8 @@@
  #include <mach/hardware.h>
  #include <asm/proc-fns.h>
  #include <asm/irq.h>
+ #include <asm/system_misc.h>
  
 -#include <mach/idle.h>
  #include <mach/regs-s3c2443-clock.h>
  
  #include <plat/gpio-core.h>

diff --cc arch/arm/mach-s3c24xx/s3c2443.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/s3c244x.c
Simple merge

diff --cc arch/arm/mach-s5p64x0/common.c
Simple merge

diff --cc arch/arm/mach-s5pc100/common.c
Simple merge

diff --cc arch/arm/mach-sa1100/generic.c
index 1d0f71b,9ad9469..7c524b4
--- 1/arch/arm/mach-sa1100/generic.c
--- 2/arch/arm/mach-sa1100/generic.c
+++ b/arch/arm/mach-sa1100/generic.c
@@@ -20,17 -19,13 +20,17 @@@
  #include <linux/ioport.h>
  #include <linux/platform_device.h>
  
 +#include <video/sa1100fb.h>
 +
  #include <asm/div64.h>
- #include <asm/system.h>
 -#include <mach/hardware.h>
  #include <asm/mach/map.h>
  #include <asm/mach/flash.h>
  #include <asm/irq.h>
+ #include <asm/system_misc.h>
  
 +#include <mach/hardware.h>
 +#include <mach/irqs.h>
 +
  #include "generic.h"
  
  unsigned int reset_status;

diff --cc arch/arm/mach-shmobile/include/mach/system.h
index 3bbcb3f,9204270..540eaff
--- 1/arch/arm/mach-shmobile/include/mach/system.h
--- 2/arch/arm/mach-shmobile/include/mach/system.h
+++ b/arch/arm/mach-shmobile/include/mach/system.h
@@@ -1,6 -1,13 +1,8 @@@
  #ifndef __ASM_ARCH_SYSTEM_H
  #define __ASM_ARCH_SYSTEM_H
  
 -static inline void arch_idle(void)
 -{
 -      cpu_do_idle();
 -}
 -
+ #include <asm/system_misc.h>
+ 
  static inline void arch_reset(char mode, const char *cmd)
  {
        soft_restart(0);

diff --cc arch/arm/mach-versatile/core.c
Simple merge

diff --cc arch/arm/mach-versatile/pci.c
Simple merge

diff --cc arch/arm/plat-iop/pci.c
Simple merge

diff --cc arch/arm/plat-mxc/system.c
Simple merge

diff --cc arch/arm/plat-omap/dma.c
Simple merge

diff --cc arch/arm/plat-s3c24xx/cpu.c
index 32a0993,ded6431..0db73ae
--- 1/arch/arm/plat-s3c24xx/cpu.c
--- 2/arch/arm/plat-s3c24xx/cpu.c
+++ b/arch/arm/plat-s3c24xx/cpu.c
@@@ -32,9 -32,9 +32,10 @@@
  #include <linux/io.h>
  
  #include <mach/hardware.h>
 +#include <mach/regs-clock.h>
  #include <asm/irq.h>
  #include <asm/cacheflush.h>
+ #include <asm/system_info.h>
  
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>

diff --cc arch/ia64/include/asm/pci.h
Simple merge

diff --cc arch/ia64/kernel/acpi.c
Simple merge

diff --cc arch/ia64/kernel/mca.c
Simple merge

diff --cc arch/ia64/pci/pci.c
Simple merge

diff --cc arch/ia64/sn/kernel/tiocx.c
Simple merge

diff --cc arch/microblaze/include/asm/page.h
index 352cc23,a25e6b5..287c548
--- 1/arch/microblaze/include/asm/page.h
--- 2/arch/microblaze/include/asm/page.h
+++ b/arch/microblaze/include/asm/page.h
@@@ -135,9 -135,9 +135,11 @@@ extern unsigned long min_low_pfn
  extern unsigned long max_pfn;
  
  extern unsigned long memory_start;
 -extern unsigned long memory_end;
  extern unsigned long memory_size;
 +extern unsigned long lowmem_size;
 +
++extern unsigned long kernel_tlb;
+ 
  extern int page_is_ram(unsigned long pfn);
  
  # define phys_to_pfn(phys)    (PFN_DOWN(phys))

diff --cc arch/microblaze/include/asm/setup.h
Simple merge

diff --cc arch/microblaze/kernel/setup.c
Simple merge

diff --cc arch/microblaze/kernel/timer.c
Simple merge

diff --cc arch/openrisc/kernel/ptrace.c
Simple merge

diff --cc arch/openrisc/kernel/setup.c
Simple merge

diff --cc arch/openrisc/kernel/traps.c
Simple merge

diff --cc arch/openrisc/mm/init.c
Simple merge

diff --cc arch/parisc/kernel/pci.c
Simple merge

diff --cc arch/powerpc/include/asm/rtas.h
Simple merge

diff --cc arch/powerpc/kernel/irq.c
Simple merge

diff --cc arch/powerpc/kernel/prom_init.c
Simple merge

diff --cc arch/powerpc/kernel/rtas.c
Simple merge

diff --cc arch/powerpc/kernel/setup_64.c
Simple merge

diff --cc arch/powerpc/kernel/vdso.c
Simple merge

diff --cc arch/powerpc/kvm/book3s_hv.c
Simple merge

diff --cc arch/powerpc/platforms/wsp/wsp_pci.c
Simple merge

diff --cc arch/s390/kernel/vdso.c
Simple merge

diff --cc arch/s390/kvm/kvm-s390.c
Simple merge

diff --cc arch/s390/oprofile/hwsampler.c
index f097d51,59c9278..c6646de
--- 1/arch/s390/oprofile/hwsampler.c
--- 2/arch/s390/oprofile/hwsampler.c
+++ b/arch/s390/oprofile/hwsampler.c
@@@ -17,7 -17,9 +17,9 @@@
  #include <linux/semaphore.h>
  #include <linux/oom.h>
  #include <linux/oprofile.h>
 -#include <asm/lowcore.h>
+ 
+ #include <asm/facility.h>
 +#include <asm/cpu_mf.h>
  #include <asm/irq.h>
  
  #include "hwsampler.h"

diff --cc arch/tile/mm/elf.c
Simple merge

diff --cc arch/unicore32/kernel/process.c
Simple merge

diff --cc arch/x86/include/asm/processor.h
Simple merge

diff --cc arch/x86/kernel/irqinit.c
Simple merge

diff --cc arch/x86/kernel/kgdb.c
Simple merge

diff --cc arch/x86/kernel/paravirt.c
Simple merge

diff --cc drivers/cpufreq/omap-cpufreq.c
index 67bbb06,3093ca6..17fa04d
--- 1/drivers/cpufreq/omap-cpufreq.c
--- 2/drivers/cpufreq/omap-cpufreq.c
+++ b/drivers/cpufreq/omap-cpufreq.c
@@@ -25,9 -25,7 +25,8 @@@
  #include <linux/opp.h>
  #include <linux/cpu.h>
  #include <linux/module.h>
 +#include <linux/regulator/consumer.h>
  
- #include <asm/system.h>
  #include <asm/smp_plat.h>
  #include <asm/cpu.h>
  

diff --cc drivers/input/serio/rpckbd.c
index 58b2244,d8aac17..2af5df6
--- 1/drivers/input/serio/rpckbd.c
--- 2/drivers/input/serio/rpckbd.c
+++ b/drivers/input/serio/rpckbd.c
@@@ -36,9 -36,9 +36,8 @@@
  #include <linux/io.h>
  #include <linux/slab.h>
  
 -#include <asm/irq.h>
  #include <mach/hardware.h>
  #include <asm/hardware/iomd.h>
- #include <asm/system.h>
  
  MODULE_AUTHOR("Vojtech Pavlik, Russell King");
  MODULE_DESCRIPTION("Acorn RiscPC PS/2 keyboard controller driver");

diff --cc drivers/input/serio/sa1111ps2.c
Simple merge

diff --cc drivers/media/media-devnode.c
Simple merge

diff --cc drivers/media/video/ivtv/ivtv-driver.h
Simple merge

diff --cc drivers/media/video/v4l2-dev.c
Simple merge

diff --cc drivers/mfd/mcp-core.c
index 6acf2e0,32c82de..62e5e36
--- 1/drivers/mfd/mcp-core.c
--- 2/drivers/mfd/mcp-core.c
+++ b/drivers/mfd/mcp-core.c
@@@ -19,8 -19,8 +19,6 @@@
  #include <linux/string.h>
  #include <linux/mfd/mcp.h>
  
- #include <asm/system.h>
 -#include <mach/dma.h>
--
  
  #define to_mcp(d)             container_of(d, struct mcp, attached_device)
  #define to_mcp_driver(d)      container_of(d, struct mcp_driver, drv)

diff --cc drivers/mfd/mcp-sa11x0.c
index 1c0ceac,4a27c2b..c54e244
--- 1/drivers/mfd/mcp-sa11x0.c
--- 2/drivers/mfd/mcp-sa11x0.c
+++ b/drivers/mfd/mcp-sa11x0.c
@@@ -19,31 -18,21 +19,30 @@@
  #include <linux/delay.h>
  #include <linux/spinlock.h>
  #include <linux/platform_device.h>
 +#include <linux/pm.h>
  #include <linux/mfd/mcp.h>
  
 -#include <mach/dma.h>
  #include <mach/hardware.h>
  #include <asm/mach-types.h>
- #include <asm/system.h>
  #include <mach/mcp.h>
  
 -#include <mach/assabet.h>
 -
 +#define DRIVER_NAME "sa11x0-mcp"
  
  struct mcp_sa11x0 {
 -      u32     mccr0;
 -      u32     mccr1;
 +      void __iomem    *base0;
 +      void __iomem    *base1;
 +      u32             mccr0;
 +      u32             mccr1;
  };
  
 +/* Register offsets */
 +#define MCCR0(m)      ((m)->base0 + 0x00)
 +#define MCDR0(m)      ((m)->base0 + 0x08)
 +#define MCDR1(m)      ((m)->base0 + 0x0c)
 +#define MCDR2(m)      ((m)->base0 + 0x10)
 +#define MCSR(m)               ((m)->base0 + 0x18)
 +#define MCCR1(m)      ((m)->base1 + 0x00)
 +
  #define priv(mcp)     ((struct mcp_sa11x0 *)mcp_priv(mcp))
  
  static void

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/tg3.c
Simple merge

diff --cc drivers/net/ethernet/cirrus/cs89x0.c
index 30fee42,98c171b..b9406cb
--- 1/drivers/net/ethernet/cirrus/cs89x0.c
--- 2/drivers/net/ethernet/cirrus/cs89x0.c
+++ b/drivers/net/ethernet/cirrus/cs89x0.c
@@@ -148,10 -148,8 +148,9 @@@
  #include <linux/delay.h>
  #include <linux/gfp.h>
  
- #include <asm/system.h>
  #include <asm/io.h>
  #include <asm/irq.h>
 +#include <linux/atomic.h>
  #if ALLOW_DMA
  #include <asm/dma.h>
  #endif

diff --cc drivers/parisc/dino.c
Simple merge

diff --cc drivers/parisc/lba_pci.c
Simple merge

diff --cc drivers/pcmcia/pxa2xx_base.c
Simple merge

diff --cc drivers/pcmcia/sa11xx_base.c
Simple merge

diff --cc drivers/pcmcia/soc_common.c
Simple merge

diff --cc drivers/s390/char/sclp_cmd.c
Simple merge

diff --cc drivers/staging/media/go7007/go7007-v4l2.c
Simple merge

diff --cc drivers/staging/media/lirc/lirc_serial.c
Simple merge

diff --cc drivers/usb/gadget/at91_udc.c
Simple merge

diff --cc drivers/usb/host/ohci-hcd.c
Simple merge

diff --cc drivers/watchdog/advantechwdt.c
index 72e8105,6112bef..64ae9e9
--- 1/drivers/watchdog/advantechwdt.c
--- 2/drivers/watchdog/advantechwdt.c
+++ b/drivers/watchdog/advantechwdt.c
@@@ -42,9 -40,9 +42,8 @@@
  #include <linux/io.h>
  #include <linux/uaccess.h>
  
- #include <asm/system.h>
  
  #define DRV_NAME "advantechwdt"
 -#define PFX DRV_NAME ": "
  #define WATCHDOG_NAME "Advantech WDT"
  #define WATCHDOG_TIMEOUT 60           /* 60 sec default timeout */
  

diff --cc drivers/watchdog/alim7101_wdt.c
index b9e9558,4868418..5eee550
--- 1/drivers/watchdog/alim7101_wdt.c
--- 2/drivers/watchdog/alim7101_wdt.c
+++ b/drivers/watchdog/alim7101_wdt.c
@@@ -36,8 -34,10 +36,7 @@@
  #include <linux/io.h>
  #include <linux/uaccess.h>
  
- #include <asm/system.h>
  
 -#define OUR_NAME "alim7101_wdt"
 -#define PFX OUR_NAME ": "
 -
  #define WDT_ENABLE 0x9C
  #define WDT_DISABLE 0x8C
  

diff --cc drivers/watchdog/booke_wdt.c
Simple merge

diff --cc drivers/watchdog/eurotechwdt.c
Simple merge

diff --cc drivers/watchdog/ib700wdt.c
Simple merge

diff --cc drivers/watchdog/it87_wdt.c
Simple merge

diff --cc drivers/watchdog/machzwd.c
Simple merge

diff --cc drivers/watchdog/pc87413_wdt.c
Simple merge

diff --cc drivers/watchdog/sbc60xxwdt.c
Simple merge

diff --cc drivers/watchdog/sbc7240_wdt.c
index 8ab757d,80f39a3..719edc8
--- 1/drivers/watchdog/sbc7240_wdt.c
--- 2/drivers/watchdog/sbc7240_wdt.c
+++ b/drivers/watchdog/sbc7240_wdt.c
@@@ -32,8 -30,9 +32,7 @@@
  #include <linux/io.h>
  #include <linux/uaccess.h>
  #include <linux/atomic.h>
- #include <asm/system.h>
  
 -#define SBC7240_PREFIX "sbc7240_wdt: "
 -
  #define SBC7240_ENABLE_PORT           0x443
  #define SBC7240_DISABLE_PORT          0x043
  #define SBC7240_SET_TIMEOUT_PORT      SBC7240_ENABLE_PORT

diff --cc drivers/watchdog/sbc8360.c
Simple merge

diff --cc drivers/watchdog/sbc_fitpc2_wdt.c
index 8404285,07d59b3..90d5527
--- 1/drivers/watchdog/sbc_fitpc2_wdt.c
--- 2/drivers/watchdog/sbc_fitpc2_wdt.c
+++ b/drivers/watchdog/sbc_fitpc2_wdt.c
@@@ -25,9 -25,8 +25,8 @@@
  #include <linux/io.h>
  #include <linux/uaccess.h>
  
- #include <asm/system.h>
  
 -static int nowayout = WATCHDOG_NOWAYOUT;
 +static bool nowayout = WATCHDOG_NOWAYOUT;
  static unsigned int margin = 60;      /* (secs) Default is 1 minute */
  static unsigned long wdt_status;
  static DEFINE_MUTEX(wdt_lock);

diff --cc drivers/watchdog/sc520_wdt.c
index d1ef585,c794803..707e027
--- 1/drivers/watchdog/sc520_wdt.c
--- 2/drivers/watchdog/sc520_wdt.c
+++ b/drivers/watchdog/sc520_wdt.c
@@@ -69,8 -67,10 +69,7 @@@
  #include <linux/io.h>
  #include <linux/uaccess.h>
  
- #include <asm/system.h>
  
 -#define OUR_NAME "sc520_wdt"
 -#define PFX OUR_NAME ": "
 -
  /*
   * The AMD Elan SC520 timeout value is 492us times a power of 2 (0-7)
   *

diff --cc drivers/watchdog/smsc37b787_wdt.c
Simple merge

diff --cc drivers/watchdog/w83627hf_wdt.c
index 4529803,1283d06..92f1326
--- 1/drivers/watchdog/w83627hf_wdt.c
--- 2/drivers/watchdog/w83627hf_wdt.c
+++ b/drivers/watchdog/w83627hf_wdt.c
@@@ -42,9 -40,9 +42,8 @@@
  #include <linux/io.h>
  #include <linux/uaccess.h>
  
- #include <asm/system.h>
  
  #define WATCHDOG_NAME "w83627hf/thf/hg/dhg WDT"
 -#define PFX WATCHDOG_NAME ": "
  #define WATCHDOG_TIMEOUT 60           /* 60 sec default timeout */
  
  static unsigned long wdt_is_open;

diff --cc drivers/watchdog/w83697hf_wdt.c
index f5c9d99,e5cb768..cd9f3c1
--- 1/drivers/watchdog/w83697hf_wdt.c
--- 2/drivers/watchdog/w83697hf_wdt.c
+++ b/drivers/watchdog/w83697hf_wdt.c
@@@ -41,9 -39,9 +41,8 @@@
  #include <linux/io.h>
  #include <linux/uaccess.h>
  
- #include <asm/system.h>
  
  #define WATCHDOG_NAME "w83697hf/hg WDT"
 -#define PFX WATCHDOG_NAME ": "
  #define WATCHDOG_TIMEOUT 60           /* 60 sec default timeout */
  #define WATCHDOG_EARLY_DISABLE 1      /* Disable until userland kicks in */
  

diff --cc drivers/watchdog/w83697ug_wdt.c
index ab45bfd,24a46ff..274be0b
--- 1/drivers/watchdog/w83697ug_wdt.c
--- 2/drivers/watchdog/w83697ug_wdt.c
+++ b/drivers/watchdog/w83697ug_wdt.c
@@@ -46,9 -44,9 +46,8 @@@
  #include <linux/io.h>
  #include <linux/uaccess.h>
  
- #include <asm/system.h>
  
  #define WATCHDOG_NAME "w83697ug/uf WDT"
 -#define PFX WATCHDOG_NAME ": "
  #define WATCHDOG_TIMEOUT 60           /* 60 sec default timeout */
  
  static unsigned long wdt_is_open;

diff --cc drivers/watchdog/w83877f_wdt.c
index e76e7e3,5f3b945..7874ae0
--- 1/drivers/watchdog/w83877f_wdt.c
--- 2/drivers/watchdog/w83877f_wdt.c
+++ b/drivers/watchdog/w83877f_wdt.c
@@@ -58,9 -56,9 +58,8 @@@
  #include <linux/init.h>
  #include <linux/io.h>
  #include <linux/uaccess.h>
- #include <asm/system.h>
  
  #define OUR_NAME "w83877f_wdt"
 -#define PFX OUR_NAME ": "
  
  #define ENABLE_W83877F_PORT 0x3F0
  #define ENABLE_W83877F 0x87

diff --cc drivers/watchdog/w83977f_wdt.c
Simple merge

diff --cc drivers/watchdog/wdt.c
Simple merge

diff --cc drivers/watchdog/wdt285.c
Simple merge

diff --cc drivers/watchdog/wdt977.c
Simple merge

diff --cc drivers/watchdog/wdt_pci.c
Simple merge

diff --cc fs/binfmt_elf.c
Simple merge

diff --cc fs/binfmt_flat.c
Simple merge

diff --cc fs/eventpoll.c
Simple merge

diff --cc fs/jbd2/commit.c
Simple merge

diff --cc fs/jbd2/journal.c
Simple merge

diff --cc fs/nfs/client.c
index 4a108a0,ad5565a..da7b5e4
--- 1/fs/nfs/client.c
--- 2/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@@ -40,10 -40,7 +40,9 @@@
  #include <net/ipv6.h>
  #include <linux/nfs_xdr.h>
  #include <linux/sunrpc/bc_xprt.h>
 +#include <linux/nsproxy.h>
 +#include <linux/pid_namespace.h>
  
- #include <asm/system.h>
  
  #include "nfs4_fs.h"
  #include "callback.h"

diff --cc fs/nfs/direct.c
Simple merge

diff --cc fs/nfs/file.c
Simple merge

diff --cc fs/nfs/inode.c
index 7bb4d13,c2ce819..e8bbfa5
--- 1/fs/nfs/inode.c
--- 2/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@@ -39,9 -39,7 +39,8 @@@
  #include <linux/slab.h>
  #include <linux/compat.h>
  #include <linux/freezer.h>
 +#include <linux/crc32.h>
  
- #include <asm/system.h>
  #include <asm/uaccess.h>
  
  #include "nfs4_fs.h"

diff --cc fs/nfs/read.c
Simple merge

diff --cc fs/nfs/super.c
index ccc4cdb,e3f6b23..37412f7
--- 1/fs/nfs/super.c
--- 2/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@@ -52,10 -52,7 +52,9 @@@
  #include <linux/nfs_xdr.h>
  #include <linux/magic.h>
  #include <linux/parser.h>
 +#include <linux/nsproxy.h>
 +#include <linux/rcupdate.h>
  
- #include <asm/system.h>
  #include <asm/uaccess.h>
  
  #include "nfs4_fs.h"

diff --cc include/linux/debug_locks.h
index 94f20c1,75cae8b..3bd46f7
--- 1/include/linux/debug_locks.h
--- 2/include/linux/debug_locks.h
+++ b/include/linux/debug_locks.h
@@@ -3,8 -3,6 +3,7 @@@
  
  #include <linux/kernel.h>
  #include <linux/atomic.h>
- #include <asm/system.h>
 +#include <linux/bug.h>
  
  struct task_struct;
  

diff --cc include/linux/ide.h
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc include/linux/skbuff.h
Simple merge

diff --cc include/linux/spinlock.h
Simple merge

diff --cc init/main.c
Simple merge

diff --cc kernel/debug/debug_core.c
Simple merge

diff --cc kernel/signal.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc lib/llist.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/ipv4/devinet.c
Simple merge

diff --cc net/sunrpc/clnt.c
Simple merge