Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jan 2009 23:09:20 +0000 (15:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jan 2009 23:09:20 +0000 (15:09 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (92 commits)
  gianfar: Revive VLAN support
  vlan: Export symbols as non GPL symbols.
  bnx2x: tx_has_work should not wait for FW
  netxen: reduce memory footprint
  netxen: fix vlan tso/checksum offload
  net: Fix linux/if_frad.h's suitability for userspace.
  net: Move config NET_NS to from net/Kconfig to init/Kconfig
  isdn: Fix missing ifdef in isdn_ppp
  networking: document "nc" in addition to "netcat" in netconsole.txt
  e1000e: workaround hw errata
  af_key: initialize xfrm encap_oa
  virtio_net: Fix MAX_PACKET_LEN to support 802.1Q VLANs
  lcs: fix compilation for !CONFIG_IP_MULTICAST
  rtl8187: Add termination packet to prevent stall
  iwlwifi: fix rs_get_rate WARN_ON()
  p54usb: fix packet loss with first generation devices
  sctp: Fix another socket race during accept/peeloff
  sctp: Properly timestamp outgoing data chunks for rtx purposes
  sctp: Correctly start rtx timer on new packet transmissions.
  sctp: Fix crc32c calculations on big-endian arhes.
  ...

599 files changed:
Documentation/kernel-parameters.txt
Documentation/sound/alsa/HD-Audio-Models.txt
Makefile
arch/arm/plat-mxc/include/mach/ipu.h [new file with mode: 0644]
arch/arm/plat-mxc/include/mach/irqs.h
arch/arm/plat-mxc/include/mach/mx3fb.h [new file with mode: 0644]
arch/m68k/include/asm/Kbuild [moved from include/asm-m68k/Kbuild with 100% similarity]
arch/m68k/include/asm/MC68328.h [moved from arch/m68knommu/include/asm/MC68328.h with 100% similarity]
arch/m68k/include/asm/MC68332.h [moved from arch/m68knommu/include/asm/MC68332.h with 100% similarity]
arch/m68k/include/asm/MC68EZ328.h [moved from arch/m68knommu/include/asm/MC68EZ328.h with 100% similarity]
arch/m68k/include/asm/MC68VZ328.h [moved from arch/m68knommu/include/asm/MC68VZ328.h with 100% similarity]
arch/m68k/include/asm/a.out-core.h [moved from include/asm-m68k/a.out-core.h with 100% similarity]
arch/m68k/include/asm/a.out.h [moved from include/asm-m68k/a.out.h with 100% similarity]
arch/m68k/include/asm/adb_iop.h [moved from include/asm-m68k/adb_iop.h with 100% similarity]
arch/m68k/include/asm/amigahw.h [moved from include/asm-m68k/amigahw.h with 100% similarity]
arch/m68k/include/asm/amigaints.h [moved from include/asm-m68k/amigaints.h with 100% similarity]
arch/m68k/include/asm/amigayle.h [moved from include/asm-m68k/amigayle.h with 100% similarity]
arch/m68k/include/asm/amipcmcia.h [moved from include/asm-m68k/amipcmcia.h with 100% similarity]
arch/m68k/include/asm/anchor.h [moved from arch/m68knommu/include/asm/anchor.h with 100% similarity]
arch/m68k/include/asm/apollodma.h [moved from include/asm-m68k/apollodma.h with 100% similarity]
arch/m68k/include/asm/apollohw.h [moved from include/asm-m68k/apollohw.h with 100% similarity]
arch/m68k/include/asm/atafd.h [moved from include/asm-m68k/atafd.h with 100% similarity]
arch/m68k/include/asm/atafdreg.h [moved from include/asm-m68k/atafdreg.h with 100% similarity]
arch/m68k/include/asm/atari_joystick.h [moved from include/asm-m68k/atari_joystick.h with 100% similarity]
arch/m68k/include/asm/atari_stdma.h [moved from include/asm-m68k/atari_stdma.h with 100% similarity]
arch/m68k/include/asm/atari_stram.h [moved from include/asm-m68k/atari_stram.h with 100% similarity]
arch/m68k/include/asm/atarihw.h [moved from include/asm-m68k/atarihw.h with 100% similarity]
arch/m68k/include/asm/atariints.h [moved from include/asm-m68k/atariints.h with 100% similarity]
arch/m68k/include/asm/atarikb.h [moved from include/asm-m68k/atarikb.h with 100% similarity]
arch/m68k/include/asm/atomic.h [new file with mode: 0644]
arch/m68k/include/asm/atomic_mm.h [moved from include/asm-m68k/atomic.h with 100% similarity]
arch/m68k/include/asm/atomic_no.h [moved from arch/m68knommu/include/asm/atomic.h with 100% similarity]
arch/m68k/include/asm/auxvec.h [moved from arch/m68knommu/include/asm/auxvec.h with 100% similarity]
arch/m68k/include/asm/bitops.h [new file with mode: 0644]
arch/m68k/include/asm/bitops_mm.h [moved from include/asm-m68k/bitops.h with 100% similarity]
arch/m68k/include/asm/bitops_no.h [moved from arch/m68knommu/include/asm/bitops.h with 100% similarity]
arch/m68k/include/asm/blinken.h [moved from include/asm-m68k/blinken.h with 100% similarity]
arch/m68k/include/asm/bootinfo.h [new file with mode: 0644]
arch/m68k/include/asm/bootinfo_mm.h [moved from include/asm-m68k/bootinfo.h with 100% similarity]
arch/m68k/include/asm/bootinfo_no.h [moved from arch/m68knommu/include/asm/bootinfo.h with 100% similarity]
arch/m68k/include/asm/bootstd.h [moved from arch/m68knommu/include/asm/bootstd.h with 100% similarity]
arch/m68k/include/asm/bug.h [new file with mode: 0644]
arch/m68k/include/asm/bug_mm.h [moved from include/asm-m68k/bug.h with 100% similarity]
arch/m68k/include/asm/bug_no.h [moved from arch/m68knommu/include/asm/bug.h with 100% similarity]
arch/m68k/include/asm/bugs.h [new file with mode: 0644]
arch/m68k/include/asm/bugs_mm.h [moved from include/asm-m68k/bugs.h with 100% similarity]
arch/m68k/include/asm/bugs_no.h [moved from arch/m68knommu/include/asm/bugs.h with 100% similarity]
arch/m68k/include/asm/bvme6000hw.h [moved from include/asm-m68k/bvme6000hw.h with 100% similarity]
arch/m68k/include/asm/byteorder.h [moved from include/asm-m68k/byteorder.h with 100% similarity]
arch/m68k/include/asm/cache.h [new file with mode: 0644]
arch/m68k/include/asm/cache_mm.h [moved from include/asm-m68k/cache.h with 100% similarity]
arch/m68k/include/asm/cache_no.h [moved from arch/m68knommu/include/asm/cache.h with 100% similarity]
arch/m68k/include/asm/cachectl.h [moved from include/asm-m68k/cachectl.h with 100% similarity]
arch/m68k/include/asm/cacheflush.h [new file with mode: 0644]
arch/m68k/include/asm/cacheflush_mm.h [moved from include/asm-m68k/cacheflush.h with 100% similarity]
arch/m68k/include/asm/cacheflush_no.h [moved from arch/m68knommu/include/asm/cacheflush.h with 100% similarity]
arch/m68k/include/asm/checksum.h [new file with mode: 0644]
arch/m68k/include/asm/checksum_mm.h [moved from include/asm-m68k/checksum.h with 100% similarity]
arch/m68k/include/asm/checksum_no.h [moved from arch/m68knommu/include/asm/checksum.h with 100% similarity]
arch/m68k/include/asm/coldfire.h [moved from arch/m68knommu/include/asm/coldfire.h with 100% similarity]
arch/m68k/include/asm/commproc.h [moved from arch/m68knommu/include/asm/commproc.h with 100% similarity]
arch/m68k/include/asm/contregs.h [moved from include/asm-m68k/contregs.h with 100% similarity]
arch/m68k/include/asm/cputime.h [moved from include/asm-m68k/cputime.h with 100% similarity]
arch/m68k/include/asm/current.h [new file with mode: 0644]
arch/m68k/include/asm/current_mm.h [moved from include/asm-m68k/current.h with 100% similarity]
arch/m68k/include/asm/current_no.h [moved from arch/m68knommu/include/asm/current.h with 100% similarity]
arch/m68k/include/asm/dbg.h [moved from arch/m68knommu/include/asm/dbg.h with 100% similarity]
arch/m68k/include/asm/delay.h [new file with mode: 0644]
arch/m68k/include/asm/delay_mm.h [moved from include/asm-m68k/delay.h with 100% similarity]
arch/m68k/include/asm/delay_no.h [moved from arch/m68knommu/include/asm/delay.h with 100% similarity]
arch/m68k/include/asm/device.h [moved from arch/m68knommu/include/asm/device.h with 100% similarity]
arch/m68k/include/asm/div64.h [new file with mode: 0644]
arch/m68k/include/asm/div64_mm.h [moved from include/asm-m68k/div64.h with 100% similarity]
arch/m68k/include/asm/div64_no.h [moved from arch/m68knommu/include/asm/div64.h with 100% similarity]
arch/m68k/include/asm/dma-mapping.h [new file with mode: 0644]
arch/m68k/include/asm/dma-mapping_mm.h [moved from include/asm-m68k/dma-mapping.h with 100% similarity]
arch/m68k/include/asm/dma-mapping_no.h [moved from arch/m68knommu/include/asm/dma-mapping.h with 100% similarity]
arch/m68k/include/asm/dma.h [new file with mode: 0644]
arch/m68k/include/asm/dma_mm.h [moved from include/asm-m68k/dma.h with 100% similarity]
arch/m68k/include/asm/dma_no.h [moved from arch/m68knommu/include/asm/dma.h with 100% similarity]
arch/m68k/include/asm/dsp56k.h [moved from include/asm-m68k/dsp56k.h with 100% similarity]
arch/m68k/include/asm/dvma.h [moved from include/asm-m68k/dvma.h with 100% similarity]
arch/m68k/include/asm/elf.h [new file with mode: 0644]
arch/m68k/include/asm/elf_mm.h [moved from include/asm-m68k/elf.h with 100% similarity]
arch/m68k/include/asm/elf_no.h [moved from arch/m68knommu/include/asm/elf.h with 100% similarity]
arch/m68k/include/asm/elia.h [moved from arch/m68knommu/include/asm/elia.h with 100% similarity]
arch/m68k/include/asm/emergency-restart.h [moved from arch/m68knommu/include/asm/emergency-restart.h with 100% similarity]
arch/m68k/include/asm/entry.h [new file with mode: 0644]
arch/m68k/include/asm/entry_mm.h [moved from include/asm-m68k/entry.h with 100% similarity]
arch/m68k/include/asm/entry_no.h [moved from arch/m68knommu/include/asm/entry.h with 100% similarity]
arch/m68k/include/asm/errno.h [moved from include/asm-m68k/errno.h with 100% similarity]
arch/m68k/include/asm/fb.h [new file with mode: 0644]
arch/m68k/include/asm/fb_mm.h [moved from include/asm-m68k/fb.h with 100% similarity]
arch/m68k/include/asm/fb_no.h [moved from arch/m68knommu/include/asm/fb.h with 100% similarity]
arch/m68k/include/asm/fbio.h [moved from include/asm-m68k/fbio.h with 100% similarity]
arch/m68k/include/asm/fcntl.h [moved from include/asm-m68k/fcntl.h with 100% similarity]
arch/m68k/include/asm/flat.h [moved from arch/m68knommu/include/asm/flat.h with 100% similarity]
arch/m68k/include/asm/floppy.h [moved from include/asm-m68k/floppy.h with 100% similarity]
arch/m68k/include/asm/fpu.h [new file with mode: 0644]
arch/m68k/include/asm/fpu_mm.h [moved from include/asm-m68k/fpu.h with 100% similarity]
arch/m68k/include/asm/fpu_no.h [moved from arch/m68knommu/include/asm/fpu.h with 100% similarity]
arch/m68k/include/asm/futex.h [moved from arch/m68knommu/include/asm/futex.h with 100% similarity]
arch/m68k/include/asm/hardirq.h [new file with mode: 0644]
arch/m68k/include/asm/hardirq_mm.h [moved from include/asm-m68k/hardirq.h with 100% similarity]
arch/m68k/include/asm/hardirq_no.h [moved from arch/m68knommu/include/asm/hardirq.h with 100% similarity]
arch/m68k/include/asm/hp300hw.h [moved from include/asm-m68k/hp300hw.h with 100% similarity]
arch/m68k/include/asm/hw_irq.h [new file with mode: 0644]
arch/m68k/include/asm/hw_irq_mm.h [moved from include/asm-m68k/hw_irq.h with 100% similarity]
arch/m68k/include/asm/hw_irq_no.h [moved from arch/m68knommu/include/asm/hw_irq.h with 100% similarity]
arch/m68k/include/asm/hwtest.h [moved from include/asm-m68k/hwtest.h with 100% similarity]
arch/m68k/include/asm/ide.h [moved from include/asm-m68k/ide.h with 100% similarity]
arch/m68k/include/asm/idprom.h [moved from include/asm-m68k/idprom.h with 100% similarity]
arch/m68k/include/asm/intersil.h [moved from include/asm-m68k/intersil.h with 100% similarity]
arch/m68k/include/asm/io.h [new file with mode: 0644]
arch/m68k/include/asm/io_mm.h [moved from include/asm-m68k/io.h with 100% similarity]
arch/m68k/include/asm/io_no.h [moved from arch/m68knommu/include/asm/io.h with 100% similarity]
arch/m68k/include/asm/ioctl.h [moved from arch/m68knommu/include/asm/ioctl.h with 100% similarity]
arch/m68k/include/asm/ioctls.h [moved from include/asm-m68k/ioctls.h with 100% similarity]
arch/m68k/include/asm/ipcbuf.h [moved from include/asm-m68k/ipcbuf.h with 100% similarity]
arch/m68k/include/asm/irq.h [new file with mode: 0644]
arch/m68k/include/asm/irq_mm.h [moved from include/asm-m68k/irq.h with 100% similarity]
arch/m68k/include/asm/irq_no.h [moved from arch/m68knommu/include/asm/irq.h with 100% similarity]
arch/m68k/include/asm/irq_regs.h [moved from arch/m68knommu/include/asm/irq_regs.h with 100% similarity]
arch/m68k/include/asm/kdebug.h [moved from arch/m68knommu/include/asm/kdebug.h with 100% similarity]
arch/m68k/include/asm/kmap_types.h [new file with mode: 0644]
arch/m68k/include/asm/kmap_types_mm.h [moved from include/asm-m68k/kmap_types.h with 100% similarity]
arch/m68k/include/asm/kmap_types_no.h [moved from arch/m68knommu/include/asm/kmap_types.h with 100% similarity]
arch/m68k/include/asm/linkage.h [moved from include/asm-m68k/linkage.h with 100% similarity]
arch/m68k/include/asm/local.h [moved from include/asm-m68k/local.h with 100% similarity]
arch/m68k/include/asm/m5206sim.h [moved from arch/m68knommu/include/asm/m5206sim.h with 100% similarity]
arch/m68k/include/asm/m520xsim.h [moved from arch/m68knommu/include/asm/m520xsim.h with 100% similarity]
arch/m68k/include/asm/m523xsim.h [moved from arch/m68knommu/include/asm/m523xsim.h with 100% similarity]
arch/m68k/include/asm/m5249sim.h [moved from arch/m68knommu/include/asm/m5249sim.h with 100% similarity]
arch/m68k/include/asm/m5272sim.h [moved from arch/m68knommu/include/asm/m5272sim.h with 100% similarity]
arch/m68k/include/asm/m527xsim.h [moved from arch/m68knommu/include/asm/m527xsim.h with 100% similarity]
arch/m68k/include/asm/m528xsim.h [moved from arch/m68knommu/include/asm/m528xsim.h with 100% similarity]
arch/m68k/include/asm/m5307sim.h [moved from arch/m68knommu/include/asm/m5307sim.h with 100% similarity]
arch/m68k/include/asm/m532xsim.h [moved from arch/m68knommu/include/asm/m532xsim.h with 100% similarity]
arch/m68k/include/asm/m5407sim.h [moved from arch/m68knommu/include/asm/m5407sim.h with 100% similarity]
arch/m68k/include/asm/m68360.h [moved from arch/m68knommu/include/asm/m68360.h with 100% similarity]
arch/m68k/include/asm/m68360_enet.h [moved from arch/m68knommu/include/asm/m68360_enet.h with 100% similarity]
arch/m68k/include/asm/m68360_pram.h [moved from arch/m68knommu/include/asm/m68360_pram.h with 100% similarity]
arch/m68k/include/asm/m68360_quicc.h [moved from arch/m68knommu/include/asm/m68360_quicc.h with 100% similarity]
arch/m68k/include/asm/m68360_regs.h [moved from arch/m68knommu/include/asm/m68360_regs.h with 100% similarity]
arch/m68k/include/asm/mac_asc.h [moved from include/asm-m68k/mac_asc.h with 100% similarity]
arch/m68k/include/asm/mac_baboon.h [moved from include/asm-m68k/mac_baboon.h with 100% similarity]
arch/m68k/include/asm/mac_iop.h [moved from include/asm-m68k/mac_iop.h with 100% similarity]
arch/m68k/include/asm/mac_mouse.h [moved from include/asm-m68k/mac_mouse.h with 100% similarity]
arch/m68k/include/asm/mac_oss.h [moved from include/asm-m68k/mac_oss.h with 100% similarity]
arch/m68k/include/asm/mac_psc.h [moved from include/asm-m68k/mac_psc.h with 100% similarity]
arch/m68k/include/asm/mac_via.h [moved from include/asm-m68k/mac_via.h with 100% similarity]
arch/m68k/include/asm/machdep.h [new file with mode: 0644]
arch/m68k/include/asm/machdep_mm.h [moved from include/asm-m68k/machdep.h with 100% similarity]
arch/m68k/include/asm/machdep_no.h [moved from arch/m68knommu/include/asm/machdep.h with 100% similarity]
arch/m68k/include/asm/machines.h [moved from include/asm-m68k/machines.h with 100% similarity]
arch/m68k/include/asm/machw.h [moved from include/asm-m68k/machw.h with 100% similarity]
arch/m68k/include/asm/macintosh.h [moved from include/asm-m68k/macintosh.h with 100% similarity]
arch/m68k/include/asm/macints.h [moved from include/asm-m68k/macints.h with 100% similarity]
arch/m68k/include/asm/math-emu.h [moved from include/asm-m68k/math-emu.h with 100% similarity]
arch/m68k/include/asm/mc146818rtc.h [new file with mode: 0644]
arch/m68k/include/asm/mc146818rtc_mm.h [moved from include/asm-m68k/mc146818rtc.h with 100% similarity]
arch/m68k/include/asm/mc146818rtc_no.h [moved from arch/m68knommu/include/asm/mc146818rtc.h with 100% similarity]
arch/m68k/include/asm/mcfcache.h [moved from arch/m68knommu/include/asm/mcfcache.h with 100% similarity]
arch/m68k/include/asm/mcfdma.h [moved from arch/m68knommu/include/asm/mcfdma.h with 100% similarity]
arch/m68k/include/asm/mcfmbus.h [moved from arch/m68knommu/include/asm/mcfmbus.h with 100% similarity]
arch/m68k/include/asm/mcfne.h [moved from arch/m68knommu/include/asm/mcfne.h with 100% similarity]
arch/m68k/include/asm/mcfpci.h [moved from arch/m68knommu/include/asm/mcfpci.h with 100% similarity]
arch/m68k/include/asm/mcfpit.h [moved from arch/m68knommu/include/asm/mcfpit.h with 100% similarity]
arch/m68k/include/asm/mcfsim.h [moved from arch/m68knommu/include/asm/mcfsim.h with 100% similarity]
arch/m68k/include/asm/mcfsmc.h [moved from arch/m68knommu/include/asm/mcfsmc.h with 100% similarity]
arch/m68k/include/asm/mcftimer.h [moved from arch/m68knommu/include/asm/mcftimer.h with 100% similarity]
arch/m68k/include/asm/mcfuart.h [moved from arch/m68knommu/include/asm/mcfuart.h with 100% similarity]
arch/m68k/include/asm/mcfwdebug.h [moved from arch/m68knommu/include/asm/mcfwdebug.h with 100% similarity]
arch/m68k/include/asm/md.h [moved from include/asm-m68k/md.h with 100% similarity]
arch/m68k/include/asm/mman.h [moved from include/asm-m68k/mman.h with 100% similarity]
arch/m68k/include/asm/mmu.h [new file with mode: 0644]
arch/m68k/include/asm/mmu_context.h [new file with mode: 0644]
arch/m68k/include/asm/mmu_context_mm.h [moved from include/asm-m68k/mmu_context.h with 100% similarity]
arch/m68k/include/asm/mmu_context_no.h [moved from arch/m68knommu/include/asm/mmu_context.h with 100% similarity]
arch/m68k/include/asm/mmu_mm.h [moved from include/asm-m68k/mmu.h with 100% similarity]
arch/m68k/include/asm/mmu_no.h [moved from arch/m68knommu/include/asm/mmu.h with 100% similarity]
arch/m68k/include/asm/mmzone.h [moved from include/asm-m68k/mmzone.h with 100% similarity]
arch/m68k/include/asm/module.h [new file with mode: 0644]
arch/m68k/include/asm/module_mm.h [moved from include/asm-m68k/module.h with 100% similarity]
arch/m68k/include/asm/module_no.h [moved from arch/m68knommu/include/asm/module.h with 100% similarity]
arch/m68k/include/asm/motorola_pgalloc.h [moved from include/asm-m68k/motorola_pgalloc.h with 100% similarity]
arch/m68k/include/asm/motorola_pgtable.h [moved from include/asm-m68k/motorola_pgtable.h with 100% similarity]
arch/m68k/include/asm/movs.h [moved from include/asm-m68k/movs.h with 100% similarity]
arch/m68k/include/asm/msgbuf.h [moved from include/asm-m68k/msgbuf.h with 100% similarity]
arch/m68k/include/asm/mutex.h [moved from arch/m68knommu/include/asm/mutex.h with 100% similarity]
arch/m68k/include/asm/mvme147hw.h [moved from include/asm-m68k/mvme147hw.h with 100% similarity]
arch/m68k/include/asm/mvme16xhw.h [moved from include/asm-m68k/mvme16xhw.h with 100% similarity]
arch/m68k/include/asm/nettel.h [moved from arch/m68knommu/include/asm/nettel.h with 100% similarity]
arch/m68k/include/asm/nubus.h [moved from include/asm-m68k/nubus.h with 100% similarity]
arch/m68k/include/asm/openprom.h [moved from include/asm-m68k/openprom.h with 100% similarity]
arch/m68k/include/asm/oplib.h [moved from include/asm-m68k/oplib.h with 100% similarity]
arch/m68k/include/asm/page.h [new file with mode: 0644]
arch/m68k/include/asm/page_mm.h [moved from include/asm-m68k/page.h with 100% similarity]
arch/m68k/include/asm/page_no.h [moved from arch/m68knommu/include/asm/page.h with 100% similarity]
arch/m68k/include/asm/page_offset.h [new file with mode: 0644]
arch/m68k/include/asm/page_offset_mm.h [moved from include/asm-m68k/page_offset.h with 100% similarity]
arch/m68k/include/asm/page_offset_no.h [moved from arch/m68knommu/include/asm/page_offset.h with 100% similarity]
arch/m68k/include/asm/param.h [new file with mode: 0644]
arch/m68k/include/asm/param_mm.h [moved from include/asm-m68k/param.h with 100% similarity]
arch/m68k/include/asm/param_no.h [moved from arch/m68knommu/include/asm/param.h with 100% similarity]
arch/m68k/include/asm/parport.h [moved from include/asm-m68k/parport.h with 100% similarity]
arch/m68k/include/asm/pci.h [new file with mode: 0644]
arch/m68k/include/asm/pci_mm.h [moved from include/asm-m68k/pci.h with 100% similarity]
arch/m68k/include/asm/pci_no.h [moved from arch/m68knommu/include/asm/pci.h with 96% similarity]
arch/m68k/include/asm/percpu.h [moved from include/asm-m68k/percpu.h with 100% similarity]
arch/m68k/include/asm/pgalloc.h [new file with mode: 0644]
arch/m68k/include/asm/pgalloc_mm.h [moved from include/asm-m68k/pgalloc.h with 100% similarity]
arch/m68k/include/asm/pgalloc_no.h [moved from arch/m68knommu/include/asm/pgalloc.h with 100% similarity]
arch/m68k/include/asm/pgtable.h [new file with mode: 0644]
arch/m68k/include/asm/pgtable_mm.h [moved from include/asm-m68k/pgtable.h with 100% similarity]
arch/m68k/include/asm/pgtable_no.h [moved from arch/m68knommu/include/asm/pgtable.h with 100% similarity]
arch/m68k/include/asm/poll.h [moved from include/asm-m68k/poll.h with 100% similarity]
arch/m68k/include/asm/posix_types.h [moved from include/asm-m68k/posix_types.h with 100% similarity]
arch/m68k/include/asm/processor.h [new file with mode: 0644]
arch/m68k/include/asm/processor_mm.h [moved from include/asm-m68k/processor.h with 100% similarity]
arch/m68k/include/asm/processor_no.h [moved from arch/m68knommu/include/asm/processor.h with 100% similarity]
arch/m68k/include/asm/ptrace.h [new file with mode: 0644]
arch/m68k/include/asm/ptrace_mm.h [moved from include/asm-m68k/ptrace.h with 100% similarity]
arch/m68k/include/asm/ptrace_no.h [moved from arch/m68knommu/include/asm/ptrace.h with 100% similarity]
arch/m68k/include/asm/q40_master.h [moved from include/asm-m68k/q40_master.h with 100% similarity]
arch/m68k/include/asm/q40ints.h [moved from include/asm-m68k/q40ints.h with 100% similarity]
arch/m68k/include/asm/quicc_simple.h [moved from arch/m68knommu/include/asm/quicc_simple.h with 100% similarity]
arch/m68k/include/asm/raw_io.h [moved from include/asm-m68k/raw_io.h with 100% similarity]
arch/m68k/include/asm/resource.h [moved from include/asm-m68k/resource.h with 100% similarity]
arch/m68k/include/asm/rtc.h [moved from include/asm-m68k/rtc.h with 100% similarity]
arch/m68k/include/asm/sbus.h [moved from include/asm-m68k/sbus.h with 100% similarity]
arch/m68k/include/asm/scatterlist.h [new file with mode: 0644]
arch/m68k/include/asm/scatterlist_mm.h [moved from include/asm-m68k/scatterlist.h with 100% similarity]
arch/m68k/include/asm/scatterlist_no.h [moved from arch/m68knommu/include/asm/scatterlist.h with 100% similarity]
arch/m68k/include/asm/sections.h [moved from include/asm-m68k/sections.h with 100% similarity]
arch/m68k/include/asm/segment.h [new file with mode: 0644]
arch/m68k/include/asm/segment_mm.h [moved from include/asm-m68k/segment.h with 100% similarity]
arch/m68k/include/asm/segment_no.h [moved from arch/m68knommu/include/asm/segment.h with 100% similarity]
arch/m68k/include/asm/sembuf.h [moved from include/asm-m68k/sembuf.h with 100% similarity]
arch/m68k/include/asm/serial.h [moved from include/asm-m68k/serial.h with 100% similarity]
arch/m68k/include/asm/setup.h [new file with mode: 0644]
arch/m68k/include/asm/setup_mm.h [moved from include/asm-m68k/setup.h with 100% similarity]
arch/m68k/include/asm/setup_no.h [moved from arch/m68knommu/include/asm/setup.h with 84% similarity]
arch/m68k/include/asm/shm.h [moved from include/asm-m68k/shm.h with 100% similarity]
arch/m68k/include/asm/shmbuf.h [moved from include/asm-m68k/shmbuf.h with 100% similarity]
arch/m68k/include/asm/shmparam.h [moved from include/asm-m68k/shmparam.h with 100% similarity]
arch/m68k/include/asm/sigcontext.h [new file with mode: 0644]
arch/m68k/include/asm/sigcontext_mm.h [moved from include/asm-m68k/sigcontext.h with 100% similarity]
arch/m68k/include/asm/sigcontext_no.h [moved from arch/m68knommu/include/asm/sigcontext.h with 100% similarity]
arch/m68k/include/asm/siginfo.h [new file with mode: 0644]
arch/m68k/include/asm/siginfo_mm.h [moved from include/asm-m68k/siginfo.h with 100% similarity]
arch/m68k/include/asm/siginfo_no.h [moved from arch/m68knommu/include/asm/siginfo.h with 100% similarity]
arch/m68k/include/asm/signal.h [new file with mode: 0644]
arch/m68k/include/asm/signal_mm.h [moved from include/asm-m68k/signal.h with 100% similarity]
arch/m68k/include/asm/signal_no.h [moved from arch/m68knommu/include/asm/signal.h with 100% similarity]
arch/m68k/include/asm/smp.h [moved from arch/m68knommu/include/asm/smp.h with 100% similarity]
arch/m68k/include/asm/socket.h [moved from include/asm-m68k/socket.h with 100% similarity]
arch/m68k/include/asm/sockios.h [moved from include/asm-m68k/sockios.h with 100% similarity]
arch/m68k/include/asm/spinlock.h [moved from include/asm-m68k/spinlock.h with 100% similarity]
arch/m68k/include/asm/stat.h [moved from include/asm-m68k/stat.h with 100% similarity]
arch/m68k/include/asm/statfs.h [moved from include/asm-m68k/statfs.h with 100% similarity]
arch/m68k/include/asm/string.h [new file with mode: 0644]
arch/m68k/include/asm/string_mm.h [moved from include/asm-m68k/string.h with 100% similarity]
arch/m68k/include/asm/string_no.h [moved from arch/m68knommu/include/asm/string.h with 100% similarity]
arch/m68k/include/asm/sun3-head.h [moved from include/asm-m68k/sun3-head.h with 100% similarity]
arch/m68k/include/asm/sun3_pgalloc.h [moved from include/asm-m68k/sun3_pgalloc.h with 100% similarity]
arch/m68k/include/asm/sun3_pgtable.h [moved from include/asm-m68k/sun3_pgtable.h with 100% similarity]
arch/m68k/include/asm/sun3ints.h [moved from include/asm-m68k/sun3ints.h with 100% similarity]
arch/m68k/include/asm/sun3mmu.h [moved from include/asm-m68k/sun3mmu.h with 100% similarity]
arch/m68k/include/asm/sun3x.h [moved from include/asm-m68k/sun3x.h with 100% similarity]
arch/m68k/include/asm/sun3xflop.h [moved from include/asm-m68k/sun3xflop.h with 100% similarity]
arch/m68k/include/asm/sun3xprom.h [moved from include/asm-m68k/sun3xprom.h with 100% similarity]
arch/m68k/include/asm/suspend.h [moved from include/asm-m68k/suspend.h with 100% similarity]
arch/m68k/include/asm/swab.h [new file with mode: 0644]
arch/m68k/include/asm/swab_mm.h [moved from include/asm-m68k/swab.h with 100% similarity]
arch/m68k/include/asm/swab_no.h [moved from arch/m68knommu/include/asm/swab.h with 100% similarity]
arch/m68k/include/asm/system.h [new file with mode: 0644]
arch/m68k/include/asm/system_mm.h [moved from include/asm-m68k/system.h with 100% similarity]
arch/m68k/include/asm/system_no.h [moved from arch/m68knommu/include/asm/system.h with 100% similarity]
arch/m68k/include/asm/termbits.h [moved from include/asm-m68k/termbits.h with 100% similarity]
arch/m68k/include/asm/termios.h [moved from include/asm-m68k/termios.h with 100% similarity]
arch/m68k/include/asm/thread_info.h [new file with mode: 0644]
arch/m68k/include/asm/thread_info_mm.h [moved from include/asm-m68k/thread_info.h with 100% similarity]
arch/m68k/include/asm/thread_info_no.h [moved from arch/m68knommu/include/asm/thread_info.h with 100% similarity]
arch/m68k/include/asm/timex.h [new file with mode: 0644]
arch/m68k/include/asm/timex_mm.h [moved from include/asm-m68k/timex.h with 100% similarity]
arch/m68k/include/asm/timex_no.h [moved from arch/m68knommu/include/asm/timex.h with 100% similarity]
arch/m68k/include/asm/tlb.h [moved from include/asm-m68k/tlb.h with 100% similarity]
arch/m68k/include/asm/tlbflush.h [new file with mode: 0644]
arch/m68k/include/asm/tlbflush_mm.h [moved from include/asm-m68k/tlbflush.h with 100% similarity]
arch/m68k/include/asm/tlbflush_no.h [moved from arch/m68knommu/include/asm/tlbflush.h with 100% similarity]
arch/m68k/include/asm/topology.h [moved from arch/m68knommu/include/asm/topology.h with 100% similarity]
arch/m68k/include/asm/traps.h [new file with mode: 0644]
arch/m68k/include/asm/traps_mm.h [moved from include/asm-m68k/traps.h with 100% similarity]
arch/m68k/include/asm/traps_no.h [moved from arch/m68knommu/include/asm/traps.h with 100% similarity]
arch/m68k/include/asm/types.h [moved from include/asm-m68k/types.h with 100% similarity]
arch/m68k/include/asm/uaccess.h [new file with mode: 0644]
arch/m68k/include/asm/uaccess_mm.h [moved from include/asm-m68k/uaccess.h with 100% similarity]
arch/m68k/include/asm/uaccess_no.h [moved from arch/m68knommu/include/asm/uaccess.h with 100% similarity]
arch/m68k/include/asm/ucontext.h [new file with mode: 0644]
arch/m68k/include/asm/ucontext_mm.h [moved from include/asm-m68k/ucontext.h with 100% similarity]
arch/m68k/include/asm/ucontext_no.h [moved from arch/m68knommu/include/asm/ucontext.h with 100% similarity]
arch/m68k/include/asm/unaligned.h [new file with mode: 0644]
arch/m68k/include/asm/unaligned_mm.h [moved from include/asm-m68k/unaligned.h with 100% similarity]
arch/m68k/include/asm/unaligned_no.h [moved from arch/m68knommu/include/asm/unaligned.h with 100% similarity]
arch/m68k/include/asm/unistd.h [new file with mode: 0644]
arch/m68k/include/asm/unistd_mm.h [moved from include/asm-m68k/unistd.h with 100% similarity]
arch/m68k/include/asm/unistd_no.h [moved from arch/m68knommu/include/asm/unistd.h with 100% similarity]
arch/m68k/include/asm/user.h [moved from include/asm-m68k/user.h with 100% similarity]
arch/m68k/include/asm/virtconvert.h [moved from include/asm-m68k/virtconvert.h with 100% similarity]
arch/m68k/include/asm/xor.h [moved from include/asm-m68k/xor.h with 100% similarity]
arch/m68k/include/asm/zorro.h [moved from include/asm-m68k/zorro.h with 100% similarity]
arch/m68knommu/include/asm/Kbuild [deleted file]
arch/m68knommu/include/asm/byteorder.h [deleted file]
arch/m68knommu/include/asm/cachectl.h [deleted file]
arch/m68knommu/include/asm/cputime.h [deleted file]
arch/m68knommu/include/asm/errno.h [deleted file]
arch/m68knommu/include/asm/fcntl.h [deleted file]
arch/m68knommu/include/asm/hwtest.h [deleted file]
arch/m68knommu/include/asm/ioctls.h [deleted file]
arch/m68knommu/include/asm/ipcbuf.h [deleted file]
arch/m68knommu/include/asm/linkage.h [deleted file]
arch/m68knommu/include/asm/local.h [deleted file]
arch/m68knommu/include/asm/math-emu.h [deleted file]
arch/m68knommu/include/asm/md.h [deleted file]
arch/m68knommu/include/asm/mman.h [deleted file]
arch/m68knommu/include/asm/movs.h [deleted file]
arch/m68knommu/include/asm/msgbuf.h [deleted file]
arch/m68knommu/include/asm/openprom.h [deleted file]
arch/m68knommu/include/asm/oplib.h [deleted file]
arch/m68knommu/include/asm/percpu.h [deleted file]
arch/m68knommu/include/asm/poll.h [deleted file]
arch/m68knommu/include/asm/posix_types.h [deleted file]
arch/m68knommu/include/asm/resource.h [deleted file]
arch/m68knommu/include/asm/rtc.h [deleted file]
arch/m68knommu/include/asm/sections.h [deleted file]
arch/m68knommu/include/asm/sembuf.h [deleted file]
arch/m68knommu/include/asm/shm.h [deleted file]
arch/m68knommu/include/asm/shmbuf.h [deleted file]
arch/m68knommu/include/asm/shmparam.h [deleted file]
arch/m68knommu/include/asm/socket.h [deleted file]
arch/m68knommu/include/asm/sockios.h [deleted file]
arch/m68knommu/include/asm/spinlock.h [deleted file]
arch/m68knommu/include/asm/stat.h [deleted file]
arch/m68knommu/include/asm/statfs.h [deleted file]
arch/m68knommu/include/asm/termbits.h [deleted file]
arch/m68knommu/include/asm/termios.h [deleted file]
arch/m68knommu/include/asm/tlb.h [deleted file]
arch/m68knommu/include/asm/types.h [deleted file]
arch/m68knommu/include/asm/user.h [deleted file]
arch/s390/include/asm/elf.h
arch/s390/kernel/compat_wrapper.S
arch/s390/kernel/syscalls.S
arch/s390/kernel/time.c
arch/s390/kernel/vtime.c
arch/sh/Kconfig
arch/sh/boards/board-ap325rxa.c
arch/sh/boards/board-magicpanelr2.c
arch/sh/boards/board-sh7785lcr.c
arch/sh/boards/mach-highlander/setup.c
arch/sh/boards/mach-hp6xx/setup.c
arch/sh/boards/mach-migor/setup.c
arch/sh/boards/mach-rsk/devices-rsk7203.c
arch/sh/boards/mach-x3proto/setup.c
arch/sh/configs/ap325rxa_defconfig
arch/sh/configs/dreamcast_defconfig
arch/sh/configs/edosk7705_defconfig
arch/sh/configs/edosk7760_defconfig
arch/sh/configs/hp6xx_defconfig
arch/sh/configs/landisk_defconfig
arch/sh/configs/lboxre2_defconfig
arch/sh/configs/magicpanelr2_defconfig
arch/sh/configs/microdev_defconfig
arch/sh/configs/migor_defconfig
arch/sh/configs/r7780mp_defconfig
arch/sh/configs/r7785rp_defconfig
arch/sh/configs/rsk7201_defconfig
arch/sh/configs/rsk7203_defconfig
arch/sh/configs/rts7751r2d1_defconfig
arch/sh/configs/rts7751r2dplus_defconfig
arch/sh/configs/sdk7780_defconfig
arch/sh/configs/se7206_defconfig
arch/sh/configs/se7343_defconfig
arch/sh/configs/se7619_defconfig
arch/sh/configs/se7705_defconfig
arch/sh/configs/se7712_defconfig
arch/sh/configs/se7721_defconfig
arch/sh/configs/se7722_defconfig
arch/sh/configs/se7750_defconfig
arch/sh/configs/se7751_defconfig
arch/sh/configs/se7780_defconfig
arch/sh/configs/sh03_defconfig
arch/sh/configs/sh7710voipgw_defconfig
arch/sh/configs/sh7763rdp_defconfig
arch/sh/configs/sh7785lcr_defconfig
arch/sh/configs/shmin_defconfig
arch/sh/configs/shx3_defconfig
arch/sh/configs/snapgear_defconfig
arch/sh/configs/systemh_defconfig
arch/sh/configs/titan_defconfig
arch/sh/configs/ul2_defconfig
arch/sh/include/asm/posix_types_32.h
arch/sh/include/asm/posix_types_64.h
arch/sh/kernel/cpu/sh4a/setup-sh7343.c
arch/sh/kernel/cpu/sh4a/setup-sh7722.c
arch/sh/kernel/process_64.c
arch/sh/kernel/traps_32.c
arch/sh/mm/ioremap_64.c
arch/sparc/Kconfig
arch/sparc/kernel/central.c
arch/sparc/kernel/cpu.c
arch/sparc/kernel/sys_sparc_64.c
arch/sparc/kernel/syscalls.S
arch/sparc/kernel/systbls.h
arch/sparc/kernel/systbls_64.S
arch/sparc/kernel/traps_64.c
arch/sparc/lib/Makefile
arch/x86/include/asm/bitops.h
arch/x86/include/asm/io.h
arch/x86/include/asm/msr-index.h
arch/x86/include/asm/pgalloc.h
arch/x86/include/asm/syscalls.h
arch/x86/include/asm/timex.h
arch/x86/kernel/apic.c
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/cpu/mtrr/generic.c
arch/x86/kernel/hpet.c
arch/x86/kernel/setup_percpu.c
arch/x86/kernel/signal.c
arch/x86/kernel/tlb_uv.c
arch/x86/kernel/vmi_32.c
arch/x86/lib/usercopy_32.c
arch/x86/lib/usercopy_64.c
arch/x86/mm/init_32.c
arch/x86/mm/init_64.c
arch/x86/mm/iomap_32.c
arch/x86/mm/ioremap.c
arch/x86/mm/pageattr.c
arch/x86/mm/pat.c
drivers/base/core.c
drivers/dma/Kconfig
drivers/dma/Makefile
drivers/dma/dmaengine.c
drivers/dma/dmatest.c
drivers/dma/fsldma.c
drivers/dma/ipu/Makefile [new file with mode: 0644]
drivers/dma/ipu/ipu_idmac.c [new file with mode: 0644]
drivers/dma/ipu/ipu_intern.h [new file with mode: 0644]
drivers/dma/ipu/ipu_irq.c [new file with mode: 0644]
drivers/gpu/drm/drm_agpsupport.c
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/drm_drv.c
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/drm_stub.c
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_lvds.c
drivers/ide/falconide.c
drivers/ide/ide-probe.c
drivers/ide/palm_bk3710.c
drivers/oprofile/cpu_buffer.c
drivers/oprofile/cpu_buffer.h
drivers/pci/hotplug/pciehp_core.c
drivers/pci/msi.c
drivers/pci/pci-driver.c
drivers/pci/pci.c
drivers/pci/pci.h
drivers/power/pda_power.c
drivers/serial/sh-sci.h
drivers/video/Kconfig
drivers/video/Makefile
drivers/video/mx3fb.c [new file with mode: 0644]
drivers/xen/balloon.c
drivers/xen/xenfs/xenbus.c
fs/9p/Kconfig [new file with mode: 0644]
fs/Kconfig
fs/adfs/Kconfig [new file with mode: 0644]
fs/affs/Kconfig [new file with mode: 0644]
fs/afs/Kconfig [new file with mode: 0644]
fs/autofs/Kconfig [new file with mode: 0644]
fs/autofs4/Kconfig [new file with mode: 0644]
fs/befs/Kconfig [new file with mode: 0644]
fs/bfs/Kconfig [new file with mode: 0644]
fs/btrfs/Kconfig [new file with mode: 0644]
fs/coda/Kconfig [new file with mode: 0644]
fs/configfs/Kconfig [new file with mode: 0644]
fs/cramfs/Kconfig [new file with mode: 0644]
fs/dlm/plock.c
fs/dquot.c
fs/ecryptfs/Kconfig [new file with mode: 0644]
fs/efs/Kconfig [new file with mode: 0644]
fs/fat/Kconfig [new file with mode: 0644]
fs/freevxfs/Kconfig [new file with mode: 0644]
fs/fuse/Kconfig [new file with mode: 0644]
fs/fuse/dev.c
fs/fuse/file.c
fs/fuse/inode.c
fs/hfs/Kconfig [new file with mode: 0644]
fs/hfsplus/Kconfig [new file with mode: 0644]
fs/hpfs/Kconfig [new file with mode: 0644]
fs/isofs/Kconfig [new file with mode: 0644]
fs/jfs/Kconfig [new file with mode: 0644]
fs/minix/Kconfig [new file with mode: 0644]
fs/ncpfs/Kconfig
fs/nfs/Kconfig [new file with mode: 0644]
fs/nfsd/Kconfig [new file with mode: 0644]
fs/notify/inotify/inotify_user.c
fs/ntfs/Kconfig [new file with mode: 0644]
fs/ocfs2/Kconfig [new file with mode: 0644]
fs/ocfs2/quota_global.c
fs/omfs/Kconfig [new file with mode: 0644]
fs/qnx4/Kconfig [new file with mode: 0644]
fs/reiserfs/Kconfig [new file with mode: 0644]
fs/romfs/Kconfig [new file with mode: 0644]
fs/smbfs/Kconfig [new file with mode: 0644]
fs/squashfs/Kconfig [new file with mode: 0644]
fs/sysfs/Kconfig [new file with mode: 0644]
fs/sysfs/bin.c
fs/sysv/Kconfig [new file with mode: 0644]
fs/udf/Kconfig [new file with mode: 0644]
fs/ufs/Kconfig [new file with mode: 0644]
fs/xfs/Kconfig
fs/xfs/linux-2.6/xfs_ioctl.c
fs/xfs/linux-2.6/xfs_ioctl.h
fs/xfs/linux-2.6/xfs_ioctl32.c
fs/xfs/linux-2.6/xfs_super.c
fs/xfs/quota/xfs_dquot.c
fs/xfs/quota/xfs_dquot.h
fs/xfs/quota/xfs_qm.c
fs/xfs/xfs_ag.h
fs/xfs/xfs_alloc_btree.c
fs/xfs/xfs_attr.c
fs/xfs/xfs_bmap.c
fs/xfs/xfs_bmap.h
fs/xfs/xfs_bmap_btree.c
fs/xfs/xfs_bmap_btree.h
fs/xfs/xfs_btree.c
fs/xfs/xfs_da_btree.c
fs/xfs/xfs_ialloc.c
fs/xfs/xfs_ialloc.h
fs/xfs/xfs_ialloc_btree.h
fs/xfs/xfs_inode.c
fs/xfs/xfs_inode_item.h
fs/xfs/xfs_iomap.c
fs/xfs/xfs_itable.c
fs/xfs/xfs_mount.c
fs/xfs/xfs_mount.h
fs/xfs/xfs_rename.c
fs/xfs/xfs_rtalloc.c
fs/xfs/xfs_rw.h
fs/xfs/xfs_sb.h
fs/xfs/xfs_vnodeops.c
include/asm-generic/bitops/__ffs.h
include/asm-generic/bitops/__fls.h
include/asm-generic/bitops/fls.h
include/asm-generic/bitops/fls64.h
include/asm-m68k/auxvec.h [deleted file]
include/asm-m68k/device.h [deleted file]
include/asm-m68k/emergency-restart.h [deleted file]
include/asm-m68k/futex.h [deleted file]
include/asm-m68k/ioctl.h [deleted file]
include/asm-m68k/irq_regs.h [deleted file]
include/asm-m68k/kdebug.h [deleted file]
include/asm-m68k/mutex.h [deleted file]
include/asm-m68k/topology.h [deleted file]
include/drm/drm_crtc.h
include/linux/debugfs.h
include/linux/dmaengine.h
include/linux/init_task.h
include/linux/klist.h
include/linux/pci.h
include/linux/quotaops.h
include/linux/sched.h
include/linux/workqueue.h
include/sound/soc-dapm.h
init/Kconfig
kernel/dma-coherent.c
kernel/fork.c
kernel/hrtimer.c
kernel/posix-cpu-timers.c
kernel/rcuclassic.c
kernel/rcutree.c
kernel/relay.c
kernel/sched_stats.h
kernel/softlockup.c
kernel/sysctl.c
kernel/time/tick-sched.c
kernel/workqueue.c
lib/Kconfig.debug
mm/nommu.c
net/sunrpc/Kconfig [new file with mode: 0644]
scripts/mod/file2alias.c
sound/pci/Kconfig
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_sigmatel.c
sound/pci/oxygen/virtuoso.c
sound/soc/atmel/atmel-pcm.c
sound/soc/fsl/mpc8610_hpcd.c

index 8511d3532c27743ef1f4f46bc9d0fe94e59bdeec..d8362cf9909ec3c42d6e1dfd5188e4bb5ab0d475 100644 (file)
@@ -577,9 +577,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        a memory unit (amount[KMG]). See also
                        Documentation/kdump/kdump.txt for a example.
 
-       cs4232=         [HW,OSS]
-                       Format: <io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>
-
        cs89x0_dma=     [HW,NET]
                        Format: <dma>
 
@@ -732,10 +729,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        Default value is 0.
                        Value can be changed at runtime via /selinux/enforce.
 
-       es1371=         [HW,OSS]
-                       Format: <spdif>,[<nomix>,[<amplifier>]]
-                       See also header of sound/oss/es1371.c.
-
        ether=          [HW,NET] Ethernet cards parameters
                        This option is obsoleted by the "netdev=" option, which
                        has equivalent usage. See its documentation for details.
index 64eb1100eec1d1aca87a5adb155c550eb365c97d..0f5d26bea80f882ef471c858d0cc0277f4051671 100644 (file)
@@ -349,6 +349,7 @@ STAC92HD73*
 STAC92HD83*
 ===========
   ref          Reference board
+  mic-ref      Reference board with power managment for ports
 
 STAC9872
 ========
index 207303da3971b3b6e354d2ace13fedc665f2a651..93b81bc10e1324a95dc1b0be5b2774660e5e7819 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -213,6 +213,10 @@ endif
 # Where to locate arch specific headers
 hdr-arch  := $(SRCARCH)
 
+ifeq ($(ARCH),m68knommu)
+       hdr-arch  := m68k
+endif
+
 KCONFIG_CONFIG ?= .config
 
 # SHELL used by kbuild
diff --git a/arch/arm/plat-mxc/include/mach/ipu.h b/arch/arm/plat-mxc/include/mach/ipu.h
new file mode 100644 (file)
index 0000000..a9221f1
--- /dev/null
@@ -0,0 +1,181 @@
+/*
+ * Copyright (C) 2008
+ * Guennadi Liakhovetski, DENX Software Engineering, <lg@denx.de>
+ *
+ * Copyright (C) 2005-2007 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _IPU_H_
+#define _IPU_H_
+
+#include <linux/types.h>
+#include <linux/dmaengine.h>
+
+/* IPU DMA Controller channel definitions. */
+enum ipu_channel {
+       IDMAC_IC_0 = 0,         /* IC (encoding task) to memory */
+       IDMAC_IC_1 = 1,         /* IC (viewfinder task) to memory */
+       IDMAC_ADC_0 = 1,
+       IDMAC_IC_2 = 2,
+       IDMAC_ADC_1 = 2,
+       IDMAC_IC_3 = 3,
+       IDMAC_IC_4 = 4,
+       IDMAC_IC_5 = 5,
+       IDMAC_IC_6 = 6,
+       IDMAC_IC_7 = 7,         /* IC (sensor data) to memory */
+       IDMAC_IC_8 = 8,
+       IDMAC_IC_9 = 9,
+       IDMAC_IC_10 = 10,
+       IDMAC_IC_11 = 11,
+       IDMAC_IC_12 = 12,
+       IDMAC_IC_13 = 13,
+       IDMAC_SDC_0 = 14,       /* Background synchronous display data */
+       IDMAC_SDC_1 = 15,       /* Foreground data (overlay) */
+       IDMAC_SDC_2 = 16,
+       IDMAC_SDC_3 = 17,
+       IDMAC_ADC_2 = 18,
+       IDMAC_ADC_3 = 19,
+       IDMAC_ADC_4 = 20,
+       IDMAC_ADC_5 = 21,
+       IDMAC_ADC_6 = 22,
+       IDMAC_ADC_7 = 23,
+       IDMAC_PF_0 = 24,
+       IDMAC_PF_1 = 25,
+       IDMAC_PF_2 = 26,
+       IDMAC_PF_3 = 27,
+       IDMAC_PF_4 = 28,
+       IDMAC_PF_5 = 29,
+       IDMAC_PF_6 = 30,
+       IDMAC_PF_7 = 31,
+};
+
+/* Order significant! */
+enum ipu_channel_status {
+       IPU_CHANNEL_FREE,
+       IPU_CHANNEL_INITIALIZED,
+       IPU_CHANNEL_READY,
+       IPU_CHANNEL_ENABLED,
+};
+
+#define IPU_CHANNELS_NUM 32
+
+enum pixel_fmt {
+       /* 1 byte */
+       IPU_PIX_FMT_GENERIC,
+       IPU_PIX_FMT_RGB332,
+       IPU_PIX_FMT_YUV420P,
+       IPU_PIX_FMT_YUV422P,
+       IPU_PIX_FMT_YUV420P2,
+       IPU_PIX_FMT_YVU422P,
+       /* 2 bytes */
+       IPU_PIX_FMT_RGB565,
+       IPU_PIX_FMT_RGB666,
+       IPU_PIX_FMT_BGR666,
+       IPU_PIX_FMT_YUYV,
+       IPU_PIX_FMT_UYVY,
+       /* 3 bytes */
+       IPU_PIX_FMT_RGB24,
+       IPU_PIX_FMT_BGR24,
+       /* 4 bytes */
+       IPU_PIX_FMT_GENERIC_32,
+       IPU_PIX_FMT_RGB32,
+       IPU_PIX_FMT_BGR32,
+       IPU_PIX_FMT_ABGR32,
+       IPU_PIX_FMT_BGRA32,
+       IPU_PIX_FMT_RGBA32,
+};
+
+enum ipu_color_space {
+       IPU_COLORSPACE_RGB,
+       IPU_COLORSPACE_YCBCR,
+       IPU_COLORSPACE_YUV
+};
+
+/*
+ * Enumeration of IPU rotation modes
+ */
+enum ipu_rotate_mode {
+       /* Note the enum values correspond to BAM value */
+       IPU_ROTATE_NONE = 0,
+       IPU_ROTATE_VERT_FLIP = 1,
+       IPU_ROTATE_HORIZ_FLIP = 2,
+       IPU_ROTATE_180 = 3,
+       IPU_ROTATE_90_RIGHT = 4,
+       IPU_ROTATE_90_RIGHT_VFLIP = 5,
+       IPU_ROTATE_90_RIGHT_HFLIP = 6,
+       IPU_ROTATE_90_LEFT = 7,
+};
+
+struct ipu_platform_data {
+       unsigned int    irq_base;
+};
+
+/*
+ * Enumeration of DI ports for ADC.
+ */
+enum display_port {
+       DISP0,
+       DISP1,
+       DISP2,
+       DISP3
+};
+
+struct idmac_video_param {
+       unsigned short          in_width;
+       unsigned short          in_height;
+       uint32_t                in_pixel_fmt;
+       unsigned short          out_width;
+       unsigned short          out_height;
+       uint32_t                out_pixel_fmt;
+       unsigned short          out_stride;
+       bool                    graphics_combine_en;
+       bool                    global_alpha_en;
+       bool                    key_color_en;
+       enum display_port       disp;
+       unsigned short          out_left;
+       unsigned short          out_top;
+};
+
+/*
+ * Union of initialization parameters for a logical channel. So far only video
+ * parameters are used.
+ */
+union ipu_channel_param {
+       struct idmac_video_param video;
+};
+
+struct idmac_tx_desc {
+       struct dma_async_tx_descriptor  txd;
+       struct scatterlist              *sg;    /* scatterlist for this */
+       unsigned int                    sg_len; /* tx-descriptor. */
+       struct list_head                list;
+};
+
+struct idmac_channel {
+       struct dma_chan         dma_chan;
+       dma_cookie_t            completed;      /* last completed cookie           */
+       union ipu_channel_param params;
+       enum ipu_channel        link;   /* input channel, linked to the output     */
+       enum ipu_channel_status status;
+       void                    *client;        /* Only one client per channel     */
+       unsigned int            n_tx_desc;
+       struct idmac_tx_desc    *desc;          /* allocated tx-descriptors        */
+       struct scatterlist      *sg[2]; /* scatterlist elements in buffer-0 and -1 */
+       struct list_head        free_list;      /* free tx-descriptors             */
+       struct list_head        queue;          /* queued tx-descriptors           */
+       spinlock_t              lock;           /* protects sg[0,1], queue         */
+       struct mutex            chan_mutex; /* protects status, cookie, free_list  */
+       bool                    sec_chan_en;
+       int                     active_buffer;
+       unsigned int            eof_irq;
+       char                    eof_name[16];   /* EOF IRQ name for request_irq()  */
+};
+
+#define to_tx_desc(tx) container_of(tx, struct idmac_tx_desc, txd)
+#define to_idmac_chan(c) container_of(c, struct idmac_channel, dma_chan)
+
+#endif
index e06d3cb0ee1143ff278771beccd259157ace2c05..c02b8fc2d8210a779b9bdf7224e999891e229565 100644 (file)
 #define MXC_BOARD_IRQ_START    (MXC_INTERNAL_IRQS + MXC_GPIO_IRQS)
 #define MXC_BOARD_IRQS 16
 
-#define NR_IRQS                (MXC_BOARD_IRQ_START + MXC_BOARD_IRQS)
+#define MXC_IPU_IRQ_START      (MXC_BOARD_IRQ_START + MXC_BOARD_IRQS)
+
+#ifdef CONFIG_MX3_IPU_IRQS
+#define MX3_IPU_IRQS CONFIG_MX3_IPU_IRQS
+#else
+#define MX3_IPU_IRQS 0
+#endif
+
+#define NR_IRQS                        (MXC_IPU_IRQ_START + MX3_IPU_IRQS)
 
 extern void imx_irq_set_priority(unsigned char irq, unsigned char prio);
 
diff --git a/arch/arm/plat-mxc/include/mach/mx3fb.h b/arch/arm/plat-mxc/include/mach/mx3fb.h
new file mode 100644 (file)
index 0000000..e391a76
--- /dev/null
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2008
+ * Guennadi Liakhovetski, DENX Software Engineering, <lg@denx.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __ASM_ARCH_MX3FB_H__
+#define __ASM_ARCH_MX3FB_H__
+
+#include <linux/device.h>
+#include <linux/fb.h>
+
+/* Proprietary FB_SYNC_ flags */
+#define FB_SYNC_OE_ACT_HIGH    0x80000000
+#define FB_SYNC_CLK_INVERT     0x40000000
+#define FB_SYNC_DATA_INVERT    0x20000000
+#define FB_SYNC_CLK_IDLE_EN    0x10000000
+#define FB_SYNC_SHARP_MODE     0x08000000
+#define FB_SYNC_SWAP_RGB       0x04000000
+#define FB_SYNC_CLK_SEL_EN     0x02000000
+
+/**
+ * struct mx3fb_platform_data - mx3fb platform data
+ *
+ * @dma_dev:   pointer to the dma-device, used for dma-slave connection
+ * @mode:      pointer to a platform-provided per mxc_register_fb() videomode
+ */
+struct mx3fb_platform_data {
+       struct device                   *dma_dev;
+       const char                      *name;
+       const struct fb_videomode       *mode;
+       int                             num_modes;
+};
+
+#endif
diff --git a/arch/m68k/include/asm/atomic.h b/arch/m68k/include/asm/atomic.h
new file mode 100644 (file)
index 0000000..8d29145
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "atomic_no.h"
+#else
+#include "atomic_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h
new file mode 100644 (file)
index 0000000..ce163ab
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "bitops_no.h"
+#else
+#include "bitops_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/bootinfo.h b/arch/m68k/include/asm/bootinfo.h
new file mode 100644 (file)
index 0000000..fedf3e3
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "bootinfo_no.h"
+#else
+#include "bootinfo_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/bug.h b/arch/m68k/include/asm/bug.h
new file mode 100644 (file)
index 0000000..997e094
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "bug_no.h"
+#else
+#include "bug_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/bugs.h b/arch/m68k/include/asm/bugs.h
new file mode 100644 (file)
index 0000000..01f047d
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "bugs_no.h"
+#else
+#include "bugs_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
new file mode 100644 (file)
index 0000000..599c29b
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "cache_no.h"
+#else
+#include "cache_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/cacheflush.h b/arch/m68k/include/asm/cacheflush.h
new file mode 100644 (file)
index 0000000..a70d731
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "cacheflush_no.h"
+#else
+#include "cacheflush_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/checksum.h b/arch/m68k/include/asm/checksum.h
new file mode 100644 (file)
index 0000000..1cf5447
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "checksum_no.h"
+#else
+#include "checksum_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/current.h b/arch/m68k/include/asm/current.h
new file mode 100644 (file)
index 0000000..51b056d
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "current_no.h"
+#else
+#include "current_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/delay.h b/arch/m68k/include/asm/delay.h
new file mode 100644 (file)
index 0000000..d2598e3
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "delay_no.h"
+#else
+#include "delay_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/div64.h b/arch/m68k/include/asm/div64.h
new file mode 100644 (file)
index 0000000..d211d9f
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "div64_no.h"
+#else
+#include "div64_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/dma-mapping.h b/arch/m68k/include/asm/dma-mapping.h
new file mode 100644 (file)
index 0000000..f4a4c76
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "dma-mapping_no.h"
+#else
+#include "dma-mapping_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/dma.h b/arch/m68k/include/asm/dma.h
new file mode 100644 (file)
index 0000000..b82e660
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "dma_no.h"
+#else
+#include "dma_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/elf.h b/arch/m68k/include/asm/elf.h
new file mode 100644 (file)
index 0000000..04ce488
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "elf_no.h"
+#else
+#include "elf_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/entry.h b/arch/m68k/include/asm/entry.h
new file mode 100644 (file)
index 0000000..876eec6
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "entry_no.h"
+#else
+#include "entry_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/fb.h b/arch/m68k/include/asm/fb.h
new file mode 100644 (file)
index 0000000..97bcaef
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "fb_no.h"
+#else
+#include "fb_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/fpu.h b/arch/m68k/include/asm/fpu.h
new file mode 100644 (file)
index 0000000..e19bc5e
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "fpu_no.h"
+#else
+#include "fpu_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/hardirq.h b/arch/m68k/include/asm/hardirq.h
new file mode 100644 (file)
index 0000000..56d0d5d
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "hardirq_no.h"
+#else
+#include "hardirq_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/hw_irq.h b/arch/m68k/include/asm/hw_irq.h
new file mode 100644 (file)
index 0000000..e195260
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "hw_irq_no.h"
+#else
+#include "hw_irq_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/io.h b/arch/m68k/include/asm/io.h
new file mode 100644 (file)
index 0000000..c7210ba
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "io_no.h"
+#else
+#include "io_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/irq.h b/arch/m68k/include/asm/irq.h
new file mode 100644 (file)
index 0000000..d031416
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "irq_no.h"
+#else
+#include "irq_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/kmap_types.h b/arch/m68k/include/asm/kmap_types.h
new file mode 100644 (file)
index 0000000..045d9fd
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "kmap_types_no.h"
+#else
+#include "kmap_types_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/machdep.h b/arch/m68k/include/asm/machdep.h
new file mode 100644 (file)
index 0000000..fc24b6f
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "machdep_no.h"
+#else
+#include "machdep_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/mc146818rtc.h b/arch/m68k/include/asm/mc146818rtc.h
new file mode 100644 (file)
index 0000000..fb90dcf
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "mc146818rtc_no.h"
+#else
+#include "mc146818rtc_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/mmu.h b/arch/m68k/include/asm/mmu.h
new file mode 100644 (file)
index 0000000..a81d394
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "mmu_no.h"
+#else
+#include "mmu_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/mmu_context.h b/arch/m68k/include/asm/mmu_context.h
new file mode 100644 (file)
index 0000000..b440928
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "mmu_context_no.h"
+#else
+#include "mmu_context_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/module.h b/arch/m68k/include/asm/module.h
new file mode 100644 (file)
index 0000000..79b59d1
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "module_no.h"
+#else
+#include "module_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/page.h b/arch/m68k/include/asm/page.h
new file mode 100644 (file)
index 0000000..f2b4480
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "page_no.h"
+#else
+#include "page_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/page_offset.h b/arch/m68k/include/asm/page_offset.h
new file mode 100644 (file)
index 0000000..66455c8
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "page_offset_no.h"
+#else
+#include "page_offset_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/param.h b/arch/m68k/include/asm/param.h
new file mode 100644 (file)
index 0000000..40d1112
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "param_no.h"
+#else
+#include "param_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/pci.h b/arch/m68k/include/asm/pci.h
new file mode 100644 (file)
index 0000000..dbea953
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "pci_no.h"
+#else
+#include "pci_mm.h"
+#endif
similarity index 96%
rename from arch/m68knommu/include/asm/pci.h
rename to arch/m68k/include/asm/pci_no.h
index a13f3cc87451be8f5fe1dd46bd8776afd9b5fd08..9abbc03c73ee7f2e5cc5be8c58da12d917204c0e 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef M68KNOMMU_PCI_H
 #define        M68KNOMMU_PCI_H
 
-#include <asm-m68k/pci.h>
+#include <asm/pci_mm.h>
 
 #ifdef CONFIG_COMEMPCI
 /*
diff --git a/arch/m68k/include/asm/pgalloc.h b/arch/m68k/include/asm/pgalloc.h
new file mode 100644 (file)
index 0000000..059cb73
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "pgalloc_no.h"
+#else
+#include "pgalloc_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/pgtable.h b/arch/m68k/include/asm/pgtable.h
new file mode 100644 (file)
index 0000000..ee6759e
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "pgtable_no.h"
+#else
+#include "pgtable_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/processor.h b/arch/m68k/include/asm/processor.h
new file mode 100644 (file)
index 0000000..fc3f2c2
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "processor_no.h"
+#else
+#include "processor_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/ptrace.h b/arch/m68k/include/asm/ptrace.h
new file mode 100644 (file)
index 0000000..e83cd2f
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "ptrace_no.h"
+#else
+#include "ptrace_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/scatterlist.h b/arch/m68k/include/asm/scatterlist.h
new file mode 100644 (file)
index 0000000..b7e5286
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "scatterlist_no.h"
+#else
+#include "scatterlist_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/segment.h b/arch/m68k/include/asm/segment.h
new file mode 100644 (file)
index 0000000..82583bc
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "segment_no.h"
+#else
+#include "segment_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/setup.h b/arch/m68k/include/asm/setup.h
new file mode 100644 (file)
index 0000000..842f86f
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "setup_no.h"
+#else
+#include "setup_mm.h"
+#endif
similarity index 84%
rename from arch/m68knommu/include/asm/setup.h
rename to arch/m68k/include/asm/setup_no.h
index fb86bb2a6078712d907a2f3705d4147538a503de..45d286ce93988dda4029b5486a2981e514a567a5 100644 (file)
@@ -1,6 +1,6 @@
 #ifdef __KERNEL__
 
-#include <asm-m68k/setup.h>
+#include <asm/setup_mm.h>
 
 /* We have a bigger command line buffer. */
 #undef COMMAND_LINE_SIZE
diff --git a/arch/m68k/include/asm/sigcontext.h b/arch/m68k/include/asm/sigcontext.h
new file mode 100644 (file)
index 0000000..bff6d40
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "sigcontext_no.h"
+#else
+#include "sigcontext_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/siginfo.h b/arch/m68k/include/asm/siginfo.h
new file mode 100644 (file)
index 0000000..61219d7
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "siginfo_no.h"
+#else
+#include "siginfo_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/signal.h b/arch/m68k/include/asm/signal.h
new file mode 100644 (file)
index 0000000..3c19988
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "signal_no.h"
+#else
+#include "signal_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/string.h b/arch/m68k/include/asm/string.h
new file mode 100644 (file)
index 0000000..2c356f9
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "string_no.h"
+#else
+#include "string_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/swab.h b/arch/m68k/include/asm/swab.h
new file mode 100644 (file)
index 0000000..7d7dde1
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "swab_no.h"
+#else
+#include "swab_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/system.h b/arch/m68k/include/asm/system.h
new file mode 100644 (file)
index 0000000..ccea925
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "system_no.h"
+#else
+#include "system_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/thread_info.h b/arch/m68k/include/asm/thread_info.h
new file mode 100644 (file)
index 0000000..f31a3f4
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "thread_info_no.h"
+#else
+#include "thread_info_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/timex.h b/arch/m68k/include/asm/timex.h
new file mode 100644 (file)
index 0000000..7197629
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "timex_no.h"
+#else
+#include "timex_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/tlbflush.h b/arch/m68k/include/asm/tlbflush.h
new file mode 100644 (file)
index 0000000..b6f93b3
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "tlbflush_no.h"
+#else
+#include "tlbflush_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/traps.h b/arch/m68k/include/asm/traps.h
new file mode 100644 (file)
index 0000000..3011ec0
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "traps_no.h"
+#else
+#include "traps_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/uaccess.h b/arch/m68k/include/asm/uaccess.h
new file mode 100644 (file)
index 0000000..38f92db
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "uaccess_no.h"
+#else
+#include "uaccess_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/ucontext.h b/arch/m68k/include/asm/ucontext.h
new file mode 100644 (file)
index 0000000..b53cd16
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "ucontext_no.h"
+#else
+#include "ucontext_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/unaligned.h b/arch/m68k/include/asm/unaligned.h
new file mode 100644 (file)
index 0000000..c640bba
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "unaligned_no.h"
+#else
+#include "unaligned_mm.h"
+#endif
diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h
new file mode 100644 (file)
index 0000000..df1d9d4
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "unistd_no.h"
+#else
+#include "unistd_mm.h"
+#endif
diff --git a/arch/m68knommu/include/asm/Kbuild b/arch/m68knommu/include/asm/Kbuild
deleted file mode 100644 (file)
index c68e168..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include include/asm-generic/Kbuild.asm
diff --git a/arch/m68knommu/include/asm/byteorder.h b/arch/m68knommu/include/asm/byteorder.h
deleted file mode 100644 (file)
index 9c6c76a..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _M68KNOMMU_BYTEORDER_H
-#define _M68KNOMMU_BYTEORDER_H
-
-#include <linux/byteorder/big_endian.h>
-
-#endif /* _M68KNOMMU_BYTEORDER_H */
diff --git a/arch/m68knommu/include/asm/cachectl.h b/arch/m68knommu/include/asm/cachectl.h
deleted file mode 100644 (file)
index bcf5a6a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/cachectl.h>
diff --git a/arch/m68knommu/include/asm/cputime.h b/arch/m68knommu/include/asm/cputime.h
deleted file mode 100644 (file)
index a0c4a66..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __M68KNOMMU_CPUTIME_H
-#define __M68KNOMMU_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* __M68KNOMMU_CPUTIME_H */
diff --git a/arch/m68knommu/include/asm/errno.h b/arch/m68knommu/include/asm/errno.h
deleted file mode 100644 (file)
index 7e8c22b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/errno.h>
diff --git a/arch/m68knommu/include/asm/fcntl.h b/arch/m68knommu/include/asm/fcntl.h
deleted file mode 100644 (file)
index f6a552c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/fcntl.h>
diff --git a/arch/m68knommu/include/asm/hwtest.h b/arch/m68knommu/include/asm/hwtest.h
deleted file mode 100644 (file)
index 700626a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/hwtest.h>
diff --git a/arch/m68knommu/include/asm/ioctls.h b/arch/m68knommu/include/asm/ioctls.h
deleted file mode 100644 (file)
index 0b1eb4d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/ioctls.h>
diff --git a/arch/m68knommu/include/asm/ipcbuf.h b/arch/m68knommu/include/asm/ipcbuf.h
deleted file mode 100644 (file)
index e4a7be6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/ipcbuf.h>
diff --git a/arch/m68knommu/include/asm/linkage.h b/arch/m68knommu/include/asm/linkage.h
deleted file mode 100644 (file)
index c288a19..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/linkage.h>
diff --git a/arch/m68knommu/include/asm/local.h b/arch/m68knommu/include/asm/local.h
deleted file mode 100644 (file)
index 84a39c1..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __M68KNOMMU_LOCAL_H
-#define __M68KNOMMU_LOCAL_H
-
-#include <asm-generic/local.h>
-
-#endif /* __M68KNOMMU_LOCAL_H */
diff --git a/arch/m68knommu/include/asm/math-emu.h b/arch/m68knommu/include/asm/math-emu.h
deleted file mode 100644 (file)
index 7e70905..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/math-emu.h>
diff --git a/arch/m68knommu/include/asm/md.h b/arch/m68knommu/include/asm/md.h
deleted file mode 100644 (file)
index d810c78..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/md.h>
diff --git a/arch/m68knommu/include/asm/mman.h b/arch/m68knommu/include/asm/mman.h
deleted file mode 100644 (file)
index 4846c68..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/mman.h>
diff --git a/arch/m68knommu/include/asm/movs.h b/arch/m68knommu/include/asm/movs.h
deleted file mode 100644 (file)
index 81a1677..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/movs.h>
diff --git a/arch/m68knommu/include/asm/msgbuf.h b/arch/m68knommu/include/asm/msgbuf.h
deleted file mode 100644 (file)
index bdfadec..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/msgbuf.h>
diff --git a/arch/m68knommu/include/asm/openprom.h b/arch/m68knommu/include/asm/openprom.h
deleted file mode 100644 (file)
index fdba795..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/openprom.h>
diff --git a/arch/m68knommu/include/asm/oplib.h b/arch/m68knommu/include/asm/oplib.h
deleted file mode 100644 (file)
index ce079dc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/oplib.h>
diff --git a/arch/m68knommu/include/asm/percpu.h b/arch/m68knommu/include/asm/percpu.h
deleted file mode 100644 (file)
index 5de72c3..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ARCH_M68KNOMMU_PERCPU__
-#define __ARCH_M68KNOMMU_PERCPU__
-
-#include <asm-generic/percpu.h>
-
-#endif /* __ARCH_M68KNOMMU_PERCPU__ */
diff --git a/arch/m68knommu/include/asm/poll.h b/arch/m68knommu/include/asm/poll.h
deleted file mode 100644 (file)
index ee1b6cb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/poll.h>
diff --git a/arch/m68knommu/include/asm/posix_types.h b/arch/m68knommu/include/asm/posix_types.h
deleted file mode 100644 (file)
index 6205fb9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/posix_types.h>
diff --git a/arch/m68knommu/include/asm/resource.h b/arch/m68knommu/include/asm/resource.h
deleted file mode 100644 (file)
index 7fa63d5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/resource.h>
diff --git a/arch/m68knommu/include/asm/rtc.h b/arch/m68knommu/include/asm/rtc.h
deleted file mode 100644 (file)
index eaf18ec..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/rtc.h>
diff --git a/arch/m68knommu/include/asm/sections.h b/arch/m68knommu/include/asm/sections.h
deleted file mode 100644 (file)
index dd0ecb9..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _M68KNOMMU_SECTIONS_H
-#define _M68KNOMMU_SECTIONS_H
-
-/* nothing to see, move along */
-#include <asm-generic/sections.h>
-
-#endif
diff --git a/arch/m68knommu/include/asm/sembuf.h b/arch/m68knommu/include/asm/sembuf.h
deleted file mode 100644 (file)
index 3a634f9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/sembuf.h>
diff --git a/arch/m68knommu/include/asm/shm.h b/arch/m68knommu/include/asm/shm.h
deleted file mode 100644 (file)
index cc8e522..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/shm.h>
diff --git a/arch/m68knommu/include/asm/shmbuf.h b/arch/m68knommu/include/asm/shmbuf.h
deleted file mode 100644 (file)
index bc34cf8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/shmbuf.h>
diff --git a/arch/m68knommu/include/asm/shmparam.h b/arch/m68knommu/include/asm/shmparam.h
deleted file mode 100644 (file)
index d7ee696..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/shmparam.h>
diff --git a/arch/m68knommu/include/asm/socket.h b/arch/m68knommu/include/asm/socket.h
deleted file mode 100644 (file)
index ac5478b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/socket.h>
diff --git a/arch/m68knommu/include/asm/sockios.h b/arch/m68knommu/include/asm/sockios.h
deleted file mode 100644 (file)
index dcc6a89..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/sockios.h>
diff --git a/arch/m68knommu/include/asm/spinlock.h b/arch/m68knommu/include/asm/spinlock.h
deleted file mode 100644 (file)
index 6bb1f06..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/spinlock.h>
diff --git a/arch/m68knommu/include/asm/stat.h b/arch/m68knommu/include/asm/stat.h
deleted file mode 100644 (file)
index 3d4b260..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/stat.h>
diff --git a/arch/m68knommu/include/asm/statfs.h b/arch/m68knommu/include/asm/statfs.h
deleted file mode 100644 (file)
index 2ce99ea..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/statfs.h>
diff --git a/arch/m68knommu/include/asm/termbits.h b/arch/m68knommu/include/asm/termbits.h
deleted file mode 100644 (file)
index 05dd6bc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/termbits.h>
diff --git a/arch/m68knommu/include/asm/termios.h b/arch/m68knommu/include/asm/termios.h
deleted file mode 100644 (file)
index e733788..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/termios.h>
diff --git a/arch/m68knommu/include/asm/tlb.h b/arch/m68knommu/include/asm/tlb.h
deleted file mode 100644 (file)
index 77a7c51..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/tlb.h>
diff --git a/arch/m68knommu/include/asm/types.h b/arch/m68knommu/include/asm/types.h
deleted file mode 100644 (file)
index 031238c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/types.h>
diff --git a/arch/m68knommu/include/asm/user.h b/arch/m68knommu/include/asm/user.h
deleted file mode 100644 (file)
index a5a555b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/user.h>
index d480f39d65e647d74da4c5ae1f97c81c3e3c8e7b..74d0bbb7d955a53d863f97b6577c2ddf35d018fb 100644 (file)
@@ -172,14 +172,14 @@ extern char elf_platform[];
 #ifndef __s390x__
 #define SET_PERSONALITY(ex) set_personality(PER_LINUX)
 #else /* __s390x__ */
-#define SET_PERSONALITY(ex)                            \
-do {                                                   \
-       if (current->personality != PER_LINUX32)        \
-               set_personality(PER_LINUX);             \
-       if ((ex).e_ident[EI_CLASS] == ELFCLASS32)       \
-               set_thread_flag(TIF_31BIT);             \
-       else                                            \
-               clear_thread_flag(TIF_31BIT);           \
+#define SET_PERSONALITY(ex)                                    \
+do {                                                           \
+       if (personality(current->personality) != PER_LINUX32)   \
+               set_personality(PER_LINUX);                     \
+       if ((ex).e_ident[EI_CLASS] == ELFCLASS32)               \
+               set_thread_flag(TIF_31BIT);                     \
+       else                                                    \
+               clear_thread_flag(TIF_31BIT);                   \
 } while (0)
 #endif /* __s390x__ */
 
index 6035cd20c7a7c542edf4e63af14200242998358f..62c706eb0de6d427401a2325dbb73e6982eec6a8 100644 (file)
@@ -1767,3 +1767,41 @@ sys_dup3_wrapper:
 sys_epoll_create1_wrapper:
        lgfr    %r2,%r2                 # int
        jg      sys_epoll_create1       # branch to system call
+
+       .globl  sys32_readahead_wrapper
+sys32_readahead_wrapper:
+       lgfr    %r2,%r2                 # int
+       llgfr   %r3,%r3                 # u32
+       llgfr   %r4,%r4                 # u32
+       lgfr    %r5,%r5                 # s32
+       jg      sys32_readahead         # branch to system call
+
+       .globl  sys32_sendfile64_wrapper
+sys32_sendfile64_wrapper:
+       lgfr    %r2,%r2                 # int
+       lgfr    %r3,%r3                 # int
+       llgtr   %r4,%r4                 # compat_loff_t *
+       lgfr    %r5,%r5                 # s32
+       jg      sys32_sendfile64        # branch to system call
+
+       .globl  sys_tkill_wrapper
+sys_tkill_wrapper:
+       lgfr    %r2,%r2                 # pid_t
+       lgfr    %r3,%r3                 # int
+       jg      sys_tkill               # branch to system call
+
+       .globl  sys_tgkill_wrapper
+sys_tgkill_wrapper:
+       lgfr    %r2,%r2                 # pid_t
+       lgfr    %r3,%r3                 # pid_t
+       lgfr    %r4,%r4                 # int
+       jg      sys_tgkill              # branch to system call
+
+       .globl  compat_sys_keyctl_wrapper
+compat_sys_keyctl_wrapper:
+       llgfr   %r2,%r2                 # u32
+       llgfr   %r3,%r3                 # u32
+       llgfr   %r4,%r4                 # u32
+       llgfr   %r5,%r5                 # u32
+       llgfr   %r6,%r6                 # u32
+       jg      compat_sys_keyctl       # branch to system call
index 76d16e0140bb97789f76bd1e0b3f72230159dbc3..fe5b25a988abedaf6f79e6b6f532831d4fe6404a 100644 (file)
@@ -194,7 +194,7 @@ SYSCALL(sys_chown16,sys_ni_syscall,sys32_chown16_wrapper)   /* old chown16 syscall
 SYSCALL(sys_getcwd,sys_getcwd,sys32_getcwd_wrapper)
 SYSCALL(sys_capget,sys_capget,sys32_capget_wrapper)
 SYSCALL(sys_capset,sys_capset,sys32_capset_wrapper)            /* 185 */
-SYSCALL(sys_sigaltstack,sys_sigaltstack,sys32_sigaltstack)
+SYSCALL(sys_sigaltstack,sys_sigaltstack,sys32_sigaltstack_wrapper)
 SYSCALL(sys_sendfile,sys_sendfile64,sys32_sendfile_wrapper)
 NI_SYSCALL                                                     /* streams1 */
 NI_SYSCALL                                                     /* streams2 */
@@ -230,8 +230,8 @@ SYSCALL(sys_mincore,sys_mincore,sys32_mincore_wrapper)
 SYSCALL(sys_madvise,sys_madvise,sys32_madvise_wrapper)
 SYSCALL(sys_getdents64,sys_getdents64,sys32_getdents64_wrapper)        /* 220 */
 SYSCALL(sys_fcntl64,sys_ni_syscall,compat_sys_fcntl64_wrapper)
-SYSCALL(sys_readahead,sys_readahead,sys32_readahead)
-SYSCALL(sys_sendfile64,sys_ni_syscall,sys32_sendfile64)
+SYSCALL(sys_readahead,sys_readahead,sys32_readahead_wrapper)
+SYSCALL(sys_sendfile64,sys_ni_syscall,sys32_sendfile64_wrapper)
 SYSCALL(sys_setxattr,sys_setxattr,sys32_setxattr_wrapper)
 SYSCALL(sys_lsetxattr,sys_lsetxattr,sys32_lsetxattr_wrapper)   /* 225 */
 SYSCALL(sys_fsetxattr,sys_fsetxattr,sys32_fsetxattr_wrapper)
@@ -245,11 +245,11 @@ SYSCALL(sys_removexattr,sys_removexattr,sys32_removexattr_wrapper)
 SYSCALL(sys_lremovexattr,sys_lremovexattr,sys32_lremovexattr_wrapper)
 SYSCALL(sys_fremovexattr,sys_fremovexattr,sys32_fremovexattr_wrapper)  /* 235 */
 SYSCALL(sys_gettid,sys_gettid,sys_gettid)
-SYSCALL(sys_tkill,sys_tkill,sys_tkill)
+SYSCALL(sys_tkill,sys_tkill,sys_tkill_wrapper)
 SYSCALL(sys_futex,sys_futex,compat_sys_futex_wrapper)
 SYSCALL(sys_sched_setaffinity,sys_sched_setaffinity,sys32_sched_setaffinity_wrapper)
 SYSCALL(sys_sched_getaffinity,sys_sched_getaffinity,sys32_sched_getaffinity_wrapper)   /* 240 */
-SYSCALL(sys_tgkill,sys_tgkill,sys_tgkill)
+SYSCALL(sys_tgkill,sys_tgkill,sys_tgkill_wrapper)
 NI_SYSCALL                                                     /* reserved for TUX */
 SYSCALL(sys_io_setup,sys_io_setup,sys32_io_setup_wrapper)
 SYSCALL(sys_io_destroy,sys_io_destroy,sys32_io_destroy_wrapper)
@@ -288,7 +288,7 @@ SYSCALL(sys_mq_getsetattr,sys_mq_getsetattr,compat_sys_mq_getsetattr_wrapper)
 SYSCALL(sys_kexec_load,sys_kexec_load,compat_sys_kexec_load_wrapper)
 SYSCALL(sys_add_key,sys_add_key,compat_sys_add_key_wrapper)
 SYSCALL(sys_request_key,sys_request_key,compat_sys_request_key_wrapper)
-SYSCALL(sys_keyctl,sys_keyctl,compat_sys_keyctl)               /* 280 */
+SYSCALL(sys_keyctl,sys_keyctl,compat_sys_keyctl_wrapper)               /* 280 */
 SYSCALL(sys_waitid,sys_waitid,compat_sys_waitid_wrapper)
 SYSCALL(sys_ioprio_set,sys_ioprio_set,sys_ioprio_set_wrapper)
 SYSCALL(sys_ioprio_get,sys_ioprio_get,sys_ioprio_get_wrapper)
index d649600df5b9a887c17f6770ad878e8820c51d92..fc468cae4460ace449d92250f777f70490a25380 100644 (file)
@@ -399,8 +399,10 @@ static struct workqueue_struct *time_sync_wq;
 
 static void __init time_init_wq(void)
 {
-       if (!time_sync_wq)
-               time_sync_wq = create_singlethread_workqueue("timesync");
+       if (time_sync_wq)
+               return;
+       time_sync_wq = create_singlethread_workqueue("timesync");
+       stop_machine_create();
 }
 
 /*
index 2fb36e462194134f53d3a7a2886938be36bf1548..ecf0304e61c1af6135a4a781a3a7b546dd77c84e 100644 (file)
@@ -516,8 +516,12 @@ EXPORT_SYMBOL(del_virt_timer);
  */
 void init_cpu_vtimer(void)
 {
+       struct thread_info *ti = current_thread_info();
        struct vtimer_queue *vq;
 
+       S390_lowcore.user_timer = ti->user_timer;
+       S390_lowcore.system_timer = ti->system_timer;
+
        /* kick the virtual timer */
        asm volatile ("STCK %0" : "=m" (S390_lowcore.last_update_clock));
        asm volatile ("STPT %0" : "=m" (S390_lowcore.last_update_timer));
index f32a5197128dcdce45374563cba26c67fed2f78e..ebabe518e729dcdb95fa551b21a4e404bca9ba93 100644 (file)
@@ -644,66 +644,25 @@ endmenu
 
 menu "Bus options"
 
-# Even on SuperH devices which don't have an ISA bus,
-# this variable helps the PCMCIA modules handle
-# IRQ requesting properly -- Greg Banks.
-#
-# Though we're generally not interested in it when
-# we're not using PCMCIA, so we make it dependent on
-# PCMCIA outright. -- PFM.
-config ISA
-       def_bool y
-       depends on PCMCIA && HD6446X_SERIES
-       help
-         Find out whether you have ISA slots on your motherboard.  ISA is the
-         name of a bus system, i.e. the way the CPU talks to the other stuff
-         inside your box.  Other bus systems are PCI, EISA, MicroChannel
-         (MCA) or VESA.  ISA is an older system, now being displaced by PCI;
-         newer boards don't support it.  If you have ISA, say Y, otherwise N.
-
-config EISA
-       bool
-       ---help---
-         The Extended Industry Standard Architecture (EISA) bus was
-         developed as an open alternative to the IBM MicroChannel bus.
-
-         The EISA bus provided some of the features of the IBM MicroChannel
-         bus while maintaining backward compatibility with cards made for
-         the older ISA bus.  The EISA bus saw limited use between 1988 and
-         1995 when it was made obsolete by the PCI bus.
-
-         Say Y here if you are building a kernel for an EISA-based machine.
-
-         Otherwise, say N.
-
-config MCA
-       bool
-       help
-         MicroChannel Architecture is found in some IBM PS/2 machines and
-         laptops.  It is a bus system similar to PCI or ISA. See
-         <file:Documentation/mca.txt> (and especially the web page given
-         there) before attempting to build an MCA bus kernel.
-
-config SBUS
-       bool
-
 config SUPERHYWAY
        tristate "SuperHyway Bus support"
        depends on CPU_SUBTYPE_SH4_202
 
 config MAPLE
-       bool "Maple Bus support"
-       depends on SH_DREAMCAST
-       help
-         The Maple Bus is SEGA's serial communication bus for peripherals
-         on the Dreamcast. Without this bus support you won't be able to
-         get your Dreamcast keyboard etc to work, so most users
-         probably want to say 'Y' here, unless you are only using the
-         Dreamcast with a serial line terminal or a remote network
-         connection.
+       bool "Maple Bus support"
+       depends on SH_DREAMCAST
+       help
+        The Maple Bus is SEGA's serial communication bus for peripherals
+        on the Dreamcast. Without this bus support you won't be able to
+        get your Dreamcast keyboard etc to work, so most users
+        probably want to say 'Y' here, unless you are only using the
+        Dreamcast with a serial line terminal or a remote network
+        connection.
 
 source "arch/sh/drivers/pci/Kconfig"
 
+source "drivers/pci/pcie/Kconfig"
+
 source "drivers/pci/Kconfig"
 
 source "drivers/pcmcia/Kconfig"
index 1c67cba6e34f1929cd53f616f35783e83e097518..caf4c33f4e8417afa35e5a72c57a0606fce8555b 100644 (file)
 #include <linux/mtd/sh_flctl.h>
 #include <linux/delay.h>
 #include <linux/i2c.h>
-#include <linux/smc911x.h>
+#include <linux/smsc911x.h>
 #include <linux/gpio.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/spi_gpio.h>
 #include <media/soc_camera_platform.h>
 #include <media/sh_mobile_ceu.h>
 #include <video/sh_mobile_lcdc.h>
 #include <asm/clock.h>
 #include <cpu/sh7723.h>
 
-static struct smc911x_platdata smc911x_info = {
-       .flags = SMC911X_USE_32BIT,
-       .irq_flags = IRQF_TRIGGER_LOW,
+static struct smsc911x_platform_config smsc911x_config = {
+       .phy_interface  = PHY_INTERFACE_MODE_MII,
+       .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
+       .irq_type       = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
+       .flags          = SMSC911X_USE_32BIT,
 };
 
-static struct resource smc9118_resources[] = {
+static struct resource smsc9118_resources[] = {
        [0] = {
                .start  = 0xb6080000,
                .end    = 0xb60fffff,
@@ -45,13 +49,13 @@ static struct resource smc9118_resources[] = {
        }
 };
 
-static struct platform_device smc9118_device = {
-       .name           = "smc911x",
+static struct platform_device smsc9118_device = {
+       .name           = "smsc911x",
        .id             = -1,
-       .num_resources  = ARRAY_SIZE(smc9118_resources),
-       .resource       = smc9118_resources,
+       .num_resources  = ARRAY_SIZE(smsc9118_resources),
+       .resource       = smsc9118_resources,
        .dev            = {
-               .platform_data = &smc911x_info,
+               .platform_data = &smsc911x_config,
        },
 };
 
@@ -315,8 +319,22 @@ static struct platform_device ceu_device = {
        },
 };
 
+struct spi_gpio_platform_data sdcard_cn3_platform_data = {
+       .sck = GPIO_PTD0,
+       .mosi = GPIO_PTD1,
+       .miso = GPIO_PTD2,
+       .num_chipselect = 1,
+};
+
+static struct platform_device sdcard_cn3_device = {
+       .name           = "spi_gpio",
+       .dev    = {
+               .platform_data  = &sdcard_cn3_platform_data,
+       },
+};
+
 static struct platform_device *ap325rxa_devices[] __initdata = {
-       &smc9118_device,
+       &smsc9118_device,
        &ap325rxa_nor_flash_device,
        &lcdc_device,
        &ceu_device,
@@ -324,6 +342,7 @@ static struct platform_device *ap325rxa_devices[] __initdata = {
        &camera_device,
 #endif
        &nand_flash_device,
+       &sdcard_cn3_device,
 };
 
 static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = {
@@ -332,6 +351,15 @@ static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = {
        },
 };
 
+static struct spi_board_info ap325rxa_spi_devices[] = {
+       {
+               .modalias = "mmc_spi",
+               .max_speed_hz = 5000000,
+               .chip_select = 0,
+               .controller_data = (void *) GPIO_PTD5,
+       },
+};
+
 static int __init ap325rxa_devices_setup(void)
 {
        /* LD3 and LD4 LEDs */
@@ -429,6 +457,9 @@ static int __init ap325rxa_devices_setup(void)
        i2c_register_board_info(0, ap325rxa_i2c_devices,
                                ARRAY_SIZE(ap325rxa_i2c_devices));
 
+       spi_register_board_info(ap325rxa_spi_devices,
+                               ARRAY_SIZE(ap325rxa_spi_devices));
+
        return platform_add_devices(ap325rxa_devices,
                                ARRAY_SIZE(ap325rxa_devices));
 }
index 3de22ccdeb7efebefcd42de79350b583b54ce1ff..0a37c8bfc959e0a8a3e34ea7d8d4d60c7738b204 100644 (file)
@@ -14,6 +14,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
+#include <linux/smsc911x.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
@@ -242,7 +243,7 @@ static void __init mpr2_setup(char **cmdline_p)
                printk(KERN_WARNING "Ethernet not ready\n");
 }
 
-static struct resource smc911x_resources[] = {
+static struct resource smsc911x_resources[] = {
        [0] = {
                .start          = 0xa8000000,
                .end            = 0xabffffff,
@@ -255,11 +256,21 @@ static struct resource smc911x_resources[] = {
        },
 };
 
-static struct platform_device smc911x_device = {
-       .name           = "smc911x",
+static struct smsc911x_platform_config smsc911x_config = {
+       .phy_interface  = PHY_INTERFACE_MODE_MII,
+       .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
+       .irq_type       = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
+       .flags          = SMSC911X_USE_32BIT,
+};
+
+static struct platform_device smsc911x_device = {
+       .name           = "smsc911x",
        .id             = -1,
-       .num_resources  = ARRAY_SIZE(smc911x_resources),
-       .resource       = smc911x_resources,
+       .num_resources  = ARRAY_SIZE(smsc911x_resources),
+       .resource       = smsc911x_resources,
+       .dev = {
+               .platform_data = &smsc911x_config,
+       },
 };
 
 static struct resource heartbeat_resources[] = {
@@ -360,7 +371,7 @@ static void __init set_mtd_partitions(void)
 
 static struct platform_device *mpr2_devices[] __initdata = {
        &heartbeat_device,
-       &smc911x_device,
+       &smsc911x_device,
        &flash_device,
 };
 
index 408bbddaf3258b02f544fe10405acea2946cfee1..38a64968d7bf84366cae105e4b18d6cf43da350d 100644 (file)
@@ -18,6 +18,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c-pca-platform.h>
 #include <linux/i2c-algo-pca.h>
+#include <linux/irq.h>
 #include <asm/heartbeat.h>
 #include <mach/sh7785lcr.h>
 
index 806438b42cacbf68f2748c7a1ed3c04a4df82a98..20fe72c515d520d732f5b373b93c11c7cac252ff 100644 (file)
@@ -18,6 +18,7 @@
 #include <linux/ata_platform.h>
 #include <linux/types.h>
 #include <linux/i2c.h>
+#include <linux/irq.h>
 #include <net/ax88796.h>
 #include <asm/machvec.h>
 #include <mach/highlander.h>
index 48fece78ff54da2ca07eaab00c75330757794455..746742bdc0142d6d45be6c55bbe38970be3324d1 100644 (file)
@@ -12,9 +12,9 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/irq.h>
 #include <asm/hd64461.h>
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <mach/hp6xx.h>
 #include <cpu/dac.h>
 
index cc1408119c243bd5e4c5f3035ab9a2e0d83732a5..28e56c5809a2187f543afa749465651a29c47ded 100644 (file)
 #include <linux/delay.h>
 #include <linux/clk.h>
 #include <linux/gpio.h>
-#include <media/soc_camera_platform.h>
-#include <media/sh_mobile_ceu.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/spi_gpio.h>
 #include <video/sh_mobile_lcdc.h>
+#include <media/sh_mobile_ceu.h>
+#include <media/ov772x.h>
+#include <media/tw9910.h>
 #include <asm/clock.h>
 #include <asm/machvec.h>
 #include <asm/io.h>
@@ -292,9 +295,12 @@ static struct platform_device migor_lcdc_device = {
 };
 
 static struct clk *camera_clk;
+static DEFINE_MUTEX(camera_lock);
 
-static void camera_power_on(void)
+static void camera_power_on(int is_tw)
 {
+       mutex_lock(&camera_lock);
+
        /* Use 10 MHz VIO_CKO instead of 24 MHz to work
         * around signal quality issues on Panel Board V2.1.
         */
@@ -304,6 +310,12 @@ static void camera_power_on(void)
 
        /* use VIO_RST to take camera out of reset */
        mdelay(10);
+       if (is_tw) {
+               gpio_set_value(GPIO_PTT2, 0);
+               gpio_set_value(GPIO_PTT0, 0);
+       } else {
+               gpio_set_value(GPIO_PTT0, 1);
+       }
        gpio_set_value(GPIO_PTT3, 0);
        mdelay(10);
        gpio_set_value(GPIO_PTT3, 1);
@@ -316,107 +328,29 @@ static void camera_power_off(void)
        clk_put(camera_clk);
 
        gpio_set_value(GPIO_PTT3, 0);
+       mutex_unlock(&camera_lock);
 }
 
-static void camera_power(int mode)
+static int ov7725_power(struct device *dev, int mode)
 {
        if (mode)
-               camera_power_on();
+               camera_power_on(0);
        else
                camera_power_off();
-}
 
-#ifdef CONFIG_I2C
-static unsigned char camera_ov772x_magic[] =
-{
-       0x09, 0x01, 0x0c, 0x20, 0x0d, 0x41, 0x0e, 0x01,
-       0x12, 0x00, 0x13, 0x8F, 0x14, 0x4A, 0x15, 0x00,
-       0x16, 0x00, 0x17, 0x23, 0x18, 0xa0, 0x19, 0x07,
-       0x1a, 0xf0, 0x1b, 0x40, 0x1f, 0x00, 0x20, 0x10,
-       0x22, 0xff, 0x23, 0x01, 0x28, 0x00, 0x29, 0xa0,
-       0x2a, 0x00, 0x2b, 0x00, 0x2c, 0xf0, 0x2d, 0x00,
-       0x2e, 0x00, 0x30, 0x80, 0x31, 0x60, 0x32, 0x00,
-       0x33, 0x00, 0x34, 0x00, 0x3d, 0x80, 0x3e, 0xe2,
-       0x3f, 0x1f, 0x42, 0x80, 0x43, 0x80, 0x44, 0x80,
-       0x45, 0x80, 0x46, 0x00, 0x47, 0x00, 0x48, 0x00,
-       0x49, 0x50, 0x4a, 0x30, 0x4b, 0x50, 0x4c, 0x50,
-       0x4d, 0x00, 0x4e, 0xef, 0x4f, 0x10, 0x50, 0x60,
-       0x51, 0x00, 0x52, 0x00, 0x53, 0x24, 0x54, 0x7a,
-       0x55, 0xfc, 0x62, 0xff, 0x63, 0xf0, 0x64, 0x1f,
-       0x65, 0x00, 0x66, 0x10, 0x67, 0x00, 0x68, 0x00,
-       0x69, 0x5c, 0x6a, 0x11, 0x6b, 0xa2, 0x6c, 0x01,
-       0x6d, 0x50, 0x6e, 0x80, 0x6f, 0x80, 0x70, 0x0f,
-       0x71, 0x00, 0x72, 0x00, 0x73, 0x0f, 0x74, 0x0f,
-       0x75, 0xff, 0x78, 0x10, 0x79, 0x70, 0x7a, 0x70,
-       0x7b, 0xf0, 0x7c, 0xf0, 0x7d, 0xf0, 0x7e, 0x0e,
-       0x7f, 0x1a, 0x80, 0x31, 0x81, 0x5a, 0x82, 0x69,
-       0x83, 0x75, 0x84, 0x7e, 0x85, 0x88, 0x86, 0x8f,
-       0x87, 0x96, 0x88, 0xa3, 0x89, 0xaf, 0x8a, 0xc4,
-       0x8b, 0xd7, 0x8c, 0xe8, 0x8d, 0x20, 0x8e, 0x00,
-       0x8f, 0x00, 0x90, 0x08, 0x91, 0x10, 0x92, 0x1f,
-       0x93, 0x01, 0x94, 0x2c, 0x95, 0x24, 0x96, 0x08,
-       0x97, 0x14, 0x98, 0x24, 0x99, 0x38, 0x9a, 0x9e,
-       0x9b, 0x00, 0x9c, 0x40, 0x9e, 0x11, 0x9f, 0x02,
-       0xa0, 0x00, 0xa1, 0x40, 0xa2, 0x40, 0xa3, 0x06,
-       0xa4, 0x00, 0xa6, 0x00, 0xa7, 0x40, 0xa8, 0x40,
-       0xa9, 0x80, 0xaa, 0x80, 0xab, 0x06, 0xac, 0xff,
-       0x12, 0x06, 0x64, 0x3f, 0x12, 0x46, 0x17, 0x3f,
-       0x18, 0x50, 0x19, 0x03, 0x1a, 0x78, 0x29, 0x50,
-       0x2c, 0x78,
-};
+       return 0;
+}
 
-static int ov772x_set_capture(struct soc_camera_platform_info *info,
-                             int enable)
+static int tw9910_power(struct device *dev, int mode)
 {
-       struct i2c_adapter *a = i2c_get_adapter(0);
-       struct i2c_msg msg;
-       int ret = 0;
-       int i;
-
-       if (!enable)
-               return 0; /* camera_power_off() is enough */
-
-       for (i = 0; i < ARRAY_SIZE(camera_ov772x_magic); i += 2) {
-               u_int8_t buf[8];
-
-               msg.addr = 0x21;
-               msg.buf = buf;
-               msg.len = 2;
-               msg.flags = 0;
-
-               buf[0] = camera_ov772x_magic[i];
-               buf[1] = camera_ov772x_magic[i + 1];
-
-               ret = (ret < 0) ? ret : i2c_transfer(a, &msg, 1);
-       }
+       if (mode)
+               camera_power_on(1);
+       else
+               camera_power_off();
 
-       return ret;
+       return 0;
 }
 
-static struct soc_camera_platform_info ov772x_info = {
-       .iface = 0,
-       .format_name = "RGB565",
-       .format_depth = 16,
-       .format = {
-               .pixelformat = V4L2_PIX_FMT_RGB565,
-               .colorspace = V4L2_COLORSPACE_SRGB,
-               .width = 320,
-               .height = 240,
-       },
-       .bus_param =  SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |
-       SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8,
-       .power = camera_power,
-       .set_capture = ov772x_set_capture,
-};
-
-static struct platform_device migor_camera_device = {
-       .name           = "soc_camera_platform",
-       .dev    = {
-               .platform_data  = &ov772x_info,
-       },
-};
-#endif /* CONFIG_I2C */
-
 static struct sh_mobile_ceu_info sh_mobile_ceu_info = {
        .flags = SOCAM_MASTER | SOCAM_DATAWIDTH_8 | SOCAM_PCLK_SAMPLE_RISING \
        | SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH,
@@ -448,16 +382,43 @@ static struct platform_device migor_ceu_device = {
        },
 };
 
+static struct ov772x_camera_info ov7725_info = {
+       .buswidth  = SOCAM_DATAWIDTH_8,
+       .link = {
+               .power  = ov7725_power,
+       },
+};
+
+static struct tw9910_video_info tw9910_info = {
+       .buswidth = SOCAM_DATAWIDTH_8,
+       .mpout    = TW9910_MPO_FIELD,
+       .link = {
+               .power  = tw9910_power,
+       }
+};
+
+struct spi_gpio_platform_data sdcard_cn9_platform_data = {
+       .sck = GPIO_PTD0,
+       .mosi = GPIO_PTD1,
+       .miso = GPIO_PTD2,
+       .num_chipselect = 1,
+};
+
+static struct platform_device sdcard_cn9_device = {
+       .name           = "spi_gpio",
+       .dev    = {
+               .platform_data  = &sdcard_cn9_platform_data,
+       },
+};
+
 static struct platform_device *migor_devices[] __initdata = {
        &smc91x_eth_device,
        &sh_keysc_device,
        &migor_lcdc_device,
        &migor_ceu_device,
-#ifdef CONFIG_I2C
-       &migor_camera_device,
-#endif
        &migor_nor_flash_device,
        &migor_nand_flash_device,
+       &sdcard_cn9_device,
 };
 
 static struct i2c_board_info migor_i2c_devices[] = {
@@ -468,6 +429,23 @@ static struct i2c_board_info migor_i2c_devices[] = {
                I2C_BOARD_INFO("migor_ts", 0x51),
                .irq = 38, /* IRQ6 */
        },
+       {
+               I2C_BOARD_INFO("ov772x", 0x21),
+               .platform_data = &ov7725_info,
+       },
+       {
+               I2C_BOARD_INFO("tw9910", 0x45),