From 9ddc128d8945d51ab38e61e385672f8061da25b4 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 26 Jan 2009 15:11:41 -0800 Subject: [PATCH] --- yaml --- r: 130222 b: refs/heads/master c: cfb901bf84fe22eb86525e9fb20675b53fb0462a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/kbuild/kbuild.txt | 29 +- trunk/Documentation/kernel-parameters.txt | 7 - trunk/Documentation/networking/netconsole.txt | 3 +- .../sound/alsa/HD-Audio-Models.txt | 1 + trunk/Makefile | 63 +- trunk/arch/arm/plat-mxc/include/mach/ipu.h | 181 ++ trunk/arch/arm/plat-mxc/include/mach/irqs.h | 10 +- trunk/arch/arm/plat-mxc/include/mach/mx3fb.h | 38 + .../asm-m68k => arch/m68k/include/asm}/Kbuild | 0 .../{m68knommu => m68k}/include/asm/MC68328.h | 0 .../{m68knommu => m68k}/include/asm/MC68332.h | 0 .../include/asm/MC68EZ328.h | 0 .../include/asm/MC68VZ328.h | 0 .../m68k/include/asm}/a.out-core.h | 0 .../m68k/include/asm}/a.out.h | 0 .../m68k/include/asm}/adb_iop.h | 0 .../m68k/include/asm}/amigahw.h | 0 .../m68k/include/asm}/amigaints.h | 0 .../m68k/include/asm}/amigayle.h | 0 .../m68k/include/asm}/amipcmcia.h | 0 .../{m68knommu => m68k}/include/asm/anchor.h | 0 .../m68k/include/asm}/apollodma.h | 0 .../m68k/include/asm}/apollohw.h | 0 .../m68k/include/asm}/atafd.h | 0 .../m68k/include/asm}/atafdreg.h | 0 .../m68k/include/asm}/atari_joystick.h | 0 .../m68k/include/asm}/atari_stdma.h | 0 .../m68k/include/asm}/atari_stram.h | 0 .../m68k/include/asm}/atarihw.h | 0 .../m68k/include/asm}/atariints.h | 0 .../m68k/include/asm}/atarikb.h | 0 trunk/arch/m68k/include/asm/atomic.h | 5 + .../m68k/include/asm/atomic_mm.h} | 0 .../atomic.h => m68k/include/asm/atomic_no.h} | 0 .../{m68knommu => m68k}/include/asm/auxvec.h | 0 trunk/arch/m68k/include/asm/bitops.h | 5 + .../m68k/include/asm/bitops_mm.h} | 0 .../bitops.h => m68k/include/asm/bitops_no.h} | 0 .../m68k/include/asm}/blinken.h | 0 trunk/arch/m68k/include/asm/bootinfo.h | 5 + .../m68k/include/asm/bootinfo_mm.h} | 0 .../include/asm/bootinfo_no.h} | 0 .../{m68knommu => m68k}/include/asm/bootstd.h | 0 trunk/arch/m68k/include/asm/bug.h | 5 + .../bug.h => arch/m68k/include/asm/bug_mm.h} | 0 .../asm/bug.h => m68k/include/asm/bug_no.h} | 0 trunk/arch/m68k/include/asm/bugs.h | 5 + .../m68k/include/asm/bugs_mm.h} | 0 .../asm/bugs.h => m68k/include/asm/bugs_no.h} | 0 .../m68k/include/asm}/bvme6000hw.h | 0 .../m68k/include/asm}/byteorder.h | 0 trunk/arch/m68k/include/asm/cache.h | 5 + .../m68k/include/asm/cache_mm.h} | 0 .../cache.h => m68k/include/asm/cache_no.h} | 0 .../m68k/include/asm}/cachectl.h | 0 trunk/arch/m68k/include/asm/cacheflush.h | 5 + .../m68k/include/asm/cacheflush_mm.h} | 0 .../include/asm/cacheflush_no.h} | 0 trunk/arch/m68k/include/asm/checksum.h | 5 + .../m68k/include/asm/checksum_mm.h} | 0 .../include/asm/checksum_no.h} | 0 .../include/asm/coldfire.h | 0 .../include/asm/commproc.h | 0 .../m68k/include/asm}/contregs.h | 0 .../m68k/include/asm}/cputime.h | 0 trunk/arch/m68k/include/asm/current.h | 5 + .../m68k/include/asm/current_mm.h} | 0 .../include/asm/current_no.h} | 0 .../{m68knommu => m68k}/include/asm/dbg.h | 0 trunk/arch/m68k/include/asm/delay.h | 5 + .../m68k/include/asm/delay_mm.h} | 0 .../delay.h => m68k/include/asm/delay_no.h} | 0 .../{m68knommu => m68k}/include/asm/device.h | 0 trunk/arch/m68k/include/asm/div64.h | 5 + .../m68k/include/asm/div64_mm.h} | 0 .../div64.h => m68k/include/asm/div64_no.h} | 0 trunk/arch/m68k/include/asm/dma-mapping.h | 5 + .../m68k/include/asm/dma-mapping_mm.h} | 0 .../include/asm/dma-mapping_no.h} | 0 trunk/arch/m68k/include/asm/dma.h | 5 + .../dma.h => arch/m68k/include/asm/dma_mm.h} | 0 .../asm/dma.h => m68k/include/asm/dma_no.h} | 0 .../m68k/include/asm}/dsp56k.h | 0 .../asm-m68k => arch/m68k/include/asm}/dvma.h | 0 trunk/arch/m68k/include/asm/elf.h | 5 + .../elf.h => arch/m68k/include/asm/elf_mm.h} | 0 .../asm/elf.h => m68k/include/asm/elf_no.h} | 0 .../{m68knommu => m68k}/include/asm/elia.h | 0 .../include/asm/emergency-restart.h | 0 trunk/arch/m68k/include/asm/entry.h | 5 + .../m68k/include/asm/entry_mm.h} | 0 .../entry.h => m68k/include/asm/entry_no.h} | 0 .../m68k/include/asm}/errno.h | 0 trunk/arch/m68k/include/asm/fb.h | 5 + .../fb.h => arch/m68k/include/asm/fb_mm.h} | 0 .../asm/fb.h => m68k/include/asm/fb_no.h} | 0 .../asm-m68k => arch/m68k/include/asm}/fbio.h | 0 .../m68k/include/asm}/fcntl.h | 0 .../{m68knommu => m68k}/include/asm/flat.h | 0 .../m68k/include/asm}/floppy.h | 0 trunk/arch/m68k/include/asm/fpu.h | 5 + .../fpu.h => arch/m68k/include/asm/fpu_mm.h} | 0 .../asm/fpu.h => m68k/include/asm/fpu_no.h} | 0 .../{m68knommu => m68k}/include/asm/futex.h | 0 trunk/arch/m68k/include/asm/hardirq.h | 5 + .../m68k/include/asm/hardirq_mm.h} | 0 .../include/asm/hardirq_no.h} | 0 .../m68k/include/asm}/hp300hw.h | 0 trunk/arch/m68k/include/asm/hw_irq.h | 5 + .../m68k/include/asm/hw_irq_mm.h} | 0 .../hw_irq.h => m68k/include/asm/hw_irq_no.h} | 0 .../m68k/include/asm}/hwtest.h | 0 .../asm-m68k => arch/m68k/include/asm}/ide.h | 0 .../m68k/include/asm}/idprom.h | 0 .../m68k/include/asm}/intersil.h | 0 trunk/arch/m68k/include/asm/io.h | 5 + .../io.h => arch/m68k/include/asm/io_mm.h} | 0 .../asm/io.h => m68k/include/asm/io_no.h} | 0 .../{m68knommu => m68k}/include/asm/ioctl.h | 0 .../m68k/include/asm}/ioctls.h | 0 .../m68k/include/asm}/ipcbuf.h | 0 trunk/arch/m68k/include/asm/irq.h | 5 + .../irq.h => arch/m68k/include/asm/irq_mm.h} | 0 .../asm/irq.h => m68k/include/asm/irq_no.h} | 0 .../include/asm/irq_regs.h | 0 .../{m68knommu => m68k}/include/asm/kdebug.h | 0 trunk/arch/m68k/include/asm/kmap_types.h | 5 + .../m68k/include/asm/kmap_types_mm.h} | 0 .../include/asm/kmap_types_no.h} | 0 .../m68k/include/asm}/linkage.h | 0 .../m68k/include/asm}/local.h | 0 .../include/asm/m5206sim.h | 0 .../include/asm/m520xsim.h | 0 .../include/asm/m523xsim.h | 0 .../include/asm/m5249sim.h | 0 .../include/asm/m5272sim.h | 0 .../include/asm/m527xsim.h | 0 .../include/asm/m528xsim.h | 0 .../include/asm/m5307sim.h | 0 .../include/asm/m532xsim.h | 0 .../include/asm/m5407sim.h | 0 .../{m68knommu => m68k}/include/asm/m68360.h | 0 .../include/asm/m68360_enet.h | 0 .../include/asm/m68360_pram.h | 0 .../include/asm/m68360_quicc.h | 0 .../include/asm/m68360_regs.h | 0 .../m68k/include/asm}/mac_asc.h | 0 .../m68k/include/asm}/mac_baboon.h | 0 .../m68k/include/asm}/mac_iop.h | 0 .../m68k/include/asm}/mac_mouse.h | 0 .../m68k/include/asm}/mac_oss.h | 0 .../m68k/include/asm}/mac_psc.h | 0 .../m68k/include/asm}/mac_via.h | 0 trunk/arch/m68k/include/asm/machdep.h | 5 + .../m68k/include/asm/machdep_mm.h} | 0 .../include/asm/machdep_no.h} | 0 .../m68k/include/asm}/machines.h | 0 .../m68k/include/asm}/machw.h | 0 .../m68k/include/asm}/macintosh.h | 0 .../m68k/include/asm}/macints.h | 0 .../m68k/include/asm}/math-emu.h | 0 trunk/arch/m68k/include/asm/mc146818rtc.h | 5 + .../m68k/include/asm/mc146818rtc_mm.h} | 0 .../include/asm/mc146818rtc_no.h} | 0 .../include/asm/mcfcache.h | 0 .../{m68knommu => m68k}/include/asm/mcfdma.h | 0 .../{m68knommu => m68k}/include/asm/mcfmbus.h | 0 .../{m68knommu => m68k}/include/asm/mcfne.h | 0 .../{m68knommu => m68k}/include/asm/mcfpci.h | 0 .../{m68knommu => m68k}/include/asm/mcfpit.h | 0 .../{m68knommu => m68k}/include/asm/mcfsim.h | 0 .../{m68knommu => m68k}/include/asm/mcfsmc.h | 0 .../include/asm/mcftimer.h | 0 .../{m68knommu => m68k}/include/asm/mcfuart.h | 0 .../include/asm/mcfwdebug.h | 0 .../asm-m68k => arch/m68k/include/asm}/md.h | 0 .../asm-m68k => arch/m68k/include/asm}/mman.h | 0 trunk/arch/m68k/include/asm/mmu.h | 5 + trunk/arch/m68k/include/asm/mmu_context.h | 5 + .../m68k/include/asm/mmu_context_mm.h} | 0 .../include/asm/mmu_context_no.h} | 0 .../mmu.h => arch/m68k/include/asm/mmu_mm.h} | 0 .../asm/mmu.h => m68k/include/asm/mmu_no.h} | 0 .../m68k/include/asm}/mmzone.h | 0 trunk/arch/m68k/include/asm/module.h | 5 + .../m68k/include/asm/module_mm.h} | 0 .../module.h => m68k/include/asm/module_no.h} | 0 .../m68k/include/asm}/motorola_pgalloc.h | 0 .../m68k/include/asm}/motorola_pgtable.h | 0 .../asm-m68k => arch/m68k/include/asm}/movs.h | 0 .../m68k/include/asm}/msgbuf.h | 0 .../{m68knommu => m68k}/include/asm/mutex.h | 0 .../m68k/include/asm}/mvme147hw.h | 0 .../m68k/include/asm}/mvme16xhw.h | 0 .../{m68knommu => m68k}/include/asm/nettel.h | 0 .../m68k/include/asm}/nubus.h | 0 .../m68k/include/asm}/openprom.h | 0 .../m68k/include/asm}/oplib.h | 0 trunk/arch/m68k/include/asm/page.h | 5 + .../m68k/include/asm/page_mm.h} | 0 .../asm/page.h => m68k/include/asm/page_no.h} | 0 trunk/arch/m68k/include/asm/page_offset.h | 5 + .../m68k/include/asm/page_offset_mm.h} | 0 .../include/asm/page_offset_no.h} | 0 trunk/arch/m68k/include/asm/param.h | 5 + .../m68k/include/asm/param_mm.h} | 0 .../param.h => m68k/include/asm/param_no.h} | 0 .../m68k/include/asm}/parport.h | 0 trunk/arch/m68k/include/asm/pci.h | 5 + .../pci.h => arch/m68k/include/asm/pci_mm.h} | 0 .../asm/pci.h => m68k/include/asm/pci_no.h} | 2 +- .../m68k/include/asm}/percpu.h | 0 trunk/arch/m68k/include/asm/pgalloc.h | 5 + .../m68k/include/asm/pgalloc_mm.h} | 0 .../include/asm/pgalloc_no.h} | 0 trunk/arch/m68k/include/asm/pgtable.h | 5 + .../m68k/include/asm/pgtable_mm.h} | 0 .../include/asm/pgtable_no.h} | 0 .../asm-m68k => arch/m68k/include/asm}/poll.h | 0 .../m68k/include/asm}/posix_types.h | 0 trunk/arch/m68k/include/asm/processor.h | 5 + .../m68k/include/asm/processor_mm.h} | 0 .../include/asm/processor_no.h} | 0 trunk/arch/m68k/include/asm/ptrace.h | 5 + .../m68k/include/asm/ptrace_mm.h} | 0 .../ptrace.h => m68k/include/asm/ptrace_no.h} | 0 .../m68k/include/asm}/q40_master.h | 0 .../m68k/include/asm}/q40ints.h | 0 .../include/asm/quicc_simple.h | 0 .../m68k/include/asm}/raw_io.h | 0 .../m68k/include/asm}/resource.h | 0 .../asm-m68k => arch/m68k/include/asm}/rtc.h | 0 .../asm-m68k => arch/m68k/include/asm}/sbus.h | 0 trunk/arch/m68k/include/asm/scatterlist.h | 5 + .../m68k/include/asm/scatterlist_mm.h} | 0 .../include/asm/scatterlist_no.h} | 0 .../m68k/include/asm}/sections.h | 0 trunk/arch/m68k/include/asm/segment.h | 5 + .../m68k/include/asm/segment_mm.h} | 0 .../include/asm/segment_no.h} | 0 .../m68k/include/asm}/sembuf.h | 0 .../m68k/include/asm}/serial.h | 0 trunk/arch/m68k/include/asm/setup.h | 5 + .../m68k/include/asm/setup_mm.h} | 0 .../setup.h => m68k/include/asm/setup_no.h} | 2 +- .../asm-m68k => arch/m68k/include/asm}/shm.h | 0 .../m68k/include/asm}/shmbuf.h | 0 .../m68k/include/asm}/shmparam.h | 0 trunk/arch/m68k/include/asm/sigcontext.h | 5 + .../m68k/include/asm/sigcontext_mm.h} | 0 .../include/asm/sigcontext_no.h} | 0 trunk/arch/m68k/include/asm/siginfo.h | 5 + .../m68k/include/asm/siginfo_mm.h} | 0 .../include/asm/siginfo_no.h} | 0 trunk/arch/m68k/include/asm/signal.h | 5 + .../m68k/include/asm/signal_mm.h} | 0 .../signal.h => m68k/include/asm/signal_no.h} | 0 .../{m68knommu => m68k}/include/asm/smp.h | 0 .../m68k/include/asm}/socket.h | 0 .../m68k/include/asm}/sockios.h | 0 .../m68k/include/asm}/spinlock.h | 0 .../asm-m68k => arch/m68k/include/asm}/stat.h | 0 .../m68k/include/asm}/statfs.h | 0 trunk/arch/m68k/include/asm/string.h | 5 + .../m68k/include/asm/string_mm.h} | 0 .../string.h => m68k/include/asm/string_no.h} | 0 .../m68k/include/asm}/sun3-head.h | 0 .../m68k/include/asm}/sun3_pgalloc.h | 0 .../m68k/include/asm}/sun3_pgtable.h | 0 .../m68k/include/asm}/sun3ints.h | 0 .../m68k/include/asm}/sun3mmu.h | 0 .../m68k/include/asm}/sun3x.h | 0 .../m68k/include/asm}/sun3xflop.h | 0 .../m68k/include/asm}/sun3xprom.h | 0 .../m68k/include/asm}/suspend.h | 0 trunk/arch/m68k/include/asm/swab.h | 5 + .../m68k/include/asm/swab_mm.h} | 0 .../asm/swab.h => m68k/include/asm/swab_no.h} | 0 trunk/arch/m68k/include/asm/system.h | 5 + .../m68k/include/asm/system_mm.h} | 0 .../system.h => m68k/include/asm/system_no.h} | 0 .../m68k/include/asm}/termbits.h | 0 .../m68k/include/asm}/termios.h | 0 trunk/arch/m68k/include/asm/thread_info.h | 5 + .../m68k/include/asm/thread_info_mm.h} | 0 .../include/asm/thread_info_no.h} | 0 trunk/arch/m68k/include/asm/timex.h | 5 + .../m68k/include/asm/timex_mm.h} | 0 .../timex.h => m68k/include/asm/timex_no.h} | 0 .../asm-m68k => arch/m68k/include/asm}/tlb.h | 0 trunk/arch/m68k/include/asm/tlbflush.h | 5 + .../m68k/include/asm/tlbflush_mm.h} | 0 .../include/asm/tlbflush_no.h} | 0 .../include/asm/topology.h | 0 trunk/arch/m68k/include/asm/traps.h | 5 + .../m68k/include/asm/traps_mm.h} | 0 .../traps.h => m68k/include/asm/traps_no.h} | 0 .../m68k/include/asm}/types.h | 0 trunk/arch/m68k/include/asm/uaccess.h | 5 + .../m68k/include/asm/uaccess_mm.h} | 0 .../include/asm/uaccess_no.h} | 0 trunk/arch/m68k/include/asm/ucontext.h | 5 + .../m68k/include/asm/ucontext_mm.h} | 0 .../include/asm/ucontext_no.h} | 0 trunk/arch/m68k/include/asm/unaligned.h | 5 + .../m68k/include/asm/unaligned_mm.h} | 0 .../include/asm/unaligned_no.h} | 0 trunk/arch/m68k/include/asm/unistd.h | 5 + .../m68k/include/asm/unistd_mm.h} | 0 .../unistd.h => m68k/include/asm/unistd_no.h} | 0 .../asm-m68k => arch/m68k/include/asm}/user.h | 0 .../m68k/include/asm}/virtconvert.h | 0 .../asm-m68k => arch/m68k/include/asm}/xor.h | 0 .../m68k/include/asm}/zorro.h | 0 trunk/arch/m68knommu/include/asm/Kbuild | 1 - trunk/arch/m68knommu/include/asm/byteorder.h | 6 - trunk/arch/m68knommu/include/asm/cachectl.h | 1 - trunk/arch/m68knommu/include/asm/cputime.h | 6 - trunk/arch/m68knommu/include/asm/errno.h | 1 - trunk/arch/m68knommu/include/asm/fcntl.h | 1 - trunk/arch/m68knommu/include/asm/hwtest.h | 1 - trunk/arch/m68knommu/include/asm/ioctls.h | 1 - trunk/arch/m68knommu/include/asm/ipcbuf.h | 1 - trunk/arch/m68knommu/include/asm/linkage.h | 1 - trunk/arch/m68knommu/include/asm/local.h | 6 - trunk/arch/m68knommu/include/asm/math-emu.h | 1 - trunk/arch/m68knommu/include/asm/md.h | 1 - trunk/arch/m68knommu/include/asm/mman.h | 1 - trunk/arch/m68knommu/include/asm/movs.h | 1 - trunk/arch/m68knommu/include/asm/msgbuf.h | 1 - trunk/arch/m68knommu/include/asm/openprom.h | 1 - trunk/arch/m68knommu/include/asm/oplib.h | 1 - trunk/arch/m68knommu/include/asm/percpu.h | 6 - trunk/arch/m68knommu/include/asm/poll.h | 1 - .../arch/m68knommu/include/asm/posix_types.h | 1 - trunk/arch/m68knommu/include/asm/resource.h | 1 - trunk/arch/m68knommu/include/asm/rtc.h | 1 - trunk/arch/m68knommu/include/asm/sections.h | 7 - trunk/arch/m68knommu/include/asm/sembuf.h | 1 - trunk/arch/m68knommu/include/asm/shm.h | 1 - trunk/arch/m68knommu/include/asm/shmbuf.h | 1 - trunk/arch/m68knommu/include/asm/shmparam.h | 1 - trunk/arch/m68knommu/include/asm/socket.h | 1 - trunk/arch/m68knommu/include/asm/sockios.h | 1 - trunk/arch/m68knommu/include/asm/spinlock.h | 1 - trunk/arch/m68knommu/include/asm/stat.h | 1 - trunk/arch/m68knommu/include/asm/statfs.h | 1 - trunk/arch/m68knommu/include/asm/termbits.h | 1 - trunk/arch/m68knommu/include/asm/termios.h | 1 - trunk/arch/m68knommu/include/asm/tlb.h | 1 - trunk/arch/m68knommu/include/asm/types.h | 1 - trunk/arch/m68knommu/include/asm/user.h | 1 - trunk/arch/s390/include/asm/elf.h | 16 +- trunk/arch/s390/kernel/compat_wrapper.S | 38 + trunk/arch/s390/kernel/syscalls.S | 12 +- trunk/arch/s390/kernel/time.c | 6 +- trunk/arch/s390/kernel/vtime.c | 4 + trunk/arch/sh/Kconfig | 63 +- trunk/arch/sh/boards/board-ap325rxa.c | 53 +- trunk/arch/sh/boards/board-magicpanelr2.c | 23 +- trunk/arch/sh/boards/board-sh7785lcr.c | 1 + trunk/arch/sh/boards/mach-highlander/setup.c | 1 + trunk/arch/sh/boards/mach-hp6xx/setup.c | 2 +- trunk/arch/sh/boards/mach-migor/setup.c | 171 +- .../arch/sh/boards/mach-rsk/devices-rsk7203.c | 24 +- trunk/arch/sh/boards/mach-x3proto/setup.c | 1 + trunk/arch/sh/configs/ap325rxa_defconfig | 355 +++- trunk/arch/sh/configs/dreamcast_defconfig | 60 +- trunk/arch/sh/configs/edosk7705_defconfig | 18 +- trunk/arch/sh/configs/edosk7760_defconfig | 83 +- trunk/arch/sh/configs/hp6xx_defconfig | 88 +- trunk/arch/sh/configs/landisk_defconfig | 76 +- trunk/arch/sh/configs/lboxre2_defconfig | 63 +- trunk/arch/sh/configs/magicpanelr2_defconfig | 119 +- trunk/arch/sh/configs/microdev_defconfig | 63 +- trunk/arch/sh/configs/migor_defconfig | 95 +- trunk/arch/sh/configs/r7780mp_defconfig | 85 +- trunk/arch/sh/configs/r7785rp_defconfig | 130 +- trunk/arch/sh/configs/rsk7201_defconfig | 26 +- trunk/arch/sh/configs/rsk7203_defconfig | 88 +- trunk/arch/sh/configs/rts7751r2d1_defconfig | 87 +- .../arch/sh/configs/rts7751r2dplus_defconfig | 87 +- trunk/arch/sh/configs/sdk7780_defconfig | 101 +- trunk/arch/sh/configs/se7206_defconfig | 75 +- trunk/arch/sh/configs/se7343_defconfig | 61 +- trunk/arch/sh/configs/se7619_defconfig | 47 +- trunk/arch/sh/configs/se7705_defconfig | 60 +- trunk/arch/sh/configs/se7712_defconfig | 79 +- trunk/arch/sh/configs/se7721_defconfig | 85 +- trunk/arch/sh/configs/se7722_defconfig | 61 +- trunk/arch/sh/configs/se7750_defconfig | 61 +- trunk/arch/sh/configs/se7751_defconfig | 56 +- trunk/arch/sh/configs/se7780_defconfig | 87 +- trunk/arch/sh/configs/sh03_defconfig | 82 +- trunk/arch/sh/configs/sh7710voipgw_defconfig | 55 +- trunk/arch/sh/configs/sh7763rdp_defconfig | 71 +- trunk/arch/sh/configs/sh7785lcr_defconfig | 92 +- trunk/arch/sh/configs/shmin_defconfig | 54 +- trunk/arch/sh/configs/shx3_defconfig | 77 +- trunk/arch/sh/configs/snapgear_defconfig | 53 +- trunk/arch/sh/configs/systemh_defconfig | 50 +- trunk/arch/sh/configs/titan_defconfig | 90 +- trunk/arch/sh/configs/ul2_defconfig | 69 +- trunk/arch/sh/include/asm/posix_types_32.h | 8 +- trunk/arch/sh/include/asm/posix_types_64.h | 8 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 31 + trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 2 +- trunk/arch/sh/kernel/process_64.c | 2 - trunk/arch/sh/kernel/traps_32.c | 9 +- trunk/arch/sh/mm/ioremap_64.c | 2 +- trunk/arch/sparc/Kconfig | 1 + trunk/arch/sparc/kernel/central.c | 2 + trunk/arch/sparc/kernel/cpu.c | 18 +- trunk/arch/sparc/kernel/sys_sparc_64.c | 48 +- trunk/arch/sparc/kernel/syscalls.S | 2 +- trunk/arch/sparc/kernel/systbls.h | 3 - trunk/arch/sparc/kernel/systbls_64.S | 16 +- trunk/arch/sparc/kernel/traps_64.c | 17 +- trunk/arch/sparc/lib/Makefile | 3 +- trunk/arch/x86/include/asm/bitops.h | 14 +- trunk/arch/x86/include/asm/io.h | 1 - trunk/arch/x86/include/asm/msr-index.h | 29 + trunk/arch/x86/include/asm/pgalloc.h | 1 + trunk/arch/x86/include/asm/syscalls.h | 2 +- trunk/arch/x86/include/asm/timex.h | 13 +- trunk/arch/x86/kernel/apic.c | 9 + .../x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 35 +- trunk/arch/x86/kernel/cpu/intel.c | 13 + trunk/arch/x86/kernel/cpu/mtrr/generic.c | 12 +- trunk/arch/x86/kernel/hpet.c | 3 +- trunk/arch/x86/kernel/setup_percpu.c | 2 +- trunk/arch/x86/kernel/signal.c | 11 +- trunk/arch/x86/kernel/tlb_uv.c | 1 + trunk/arch/x86/kernel/vmi_32.c | 2 +- trunk/arch/x86/lib/usercopy_32.c | 4 +- trunk/arch/x86/lib/usercopy_64.c | 4 +- trunk/arch/x86/mm/init_32.c | 48 +- trunk/arch/x86/mm/init_64.c | 2 +- trunk/arch/x86/mm/iomap_32.c | 10 + trunk/arch/x86/mm/ioremap.c | 25 - trunk/arch/x86/mm/pageattr.c | 49 +- trunk/arch/x86/mm/pat.c | 43 +- trunk/arch/x86/scripts/strip-symbols | 1 - trunk/drivers/base/core.c | 6 + trunk/drivers/dma/Kconfig | 19 + trunk/drivers/dma/Makefile | 1 + trunk/drivers/dma/dmaengine.c | 8 +- trunk/drivers/dma/dmatest.c | 35 +- trunk/drivers/dma/fsldma.c | 8 +- trunk/drivers/dma/ipu/Makefile | 1 + trunk/drivers/dma/ipu/ipu_idmac.c | 1740 +++++++++++++++++ trunk/drivers/dma/ipu/ipu_intern.h | 176 ++ trunk/drivers/dma/ipu/ipu_irq.c | 413 ++++ trunk/drivers/gpu/drm/drm_agpsupport.c | 3 +- trunk/drivers/gpu/drm/drm_crtc.c | 14 +- trunk/drivers/gpu/drm/drm_drv.c | 4 + trunk/drivers/gpu/drm/drm_edid.c | 2 +- trunk/drivers/gpu/drm/drm_stub.c | 8 + trunk/drivers/gpu/drm/i915/i915_dma.c | 7 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 4 +- trunk/drivers/gpu/drm/i915/intel_lvds.c | 13 + trunk/drivers/ide/falconide.c | 2 +- trunk/drivers/ide/ide-probe.c | 3 +- trunk/drivers/ide/palm_bk3710.c | 11 +- trunk/drivers/isdn/i4l/isdn_ppp.c | 2 + trunk/drivers/net/bnx2x.h | 11 +- trunk/drivers/net/bnx2x_link.c | 64 +- trunk/drivers/net/bnx2x_main.c | 302 +-- trunk/drivers/net/bnx2x_reg.h | 2 +- trunk/drivers/net/cxgb3/sge.c | 1 + trunk/drivers/net/e1000e/82571.c | 6 +- trunk/drivers/net/e1000e/hw.h | 1 + trunk/drivers/net/gianfar.c | 6 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 62 +- trunk/drivers/net/ixgbe/ixgbe_type.h | 3 + trunk/drivers/net/korina.c | 15 +- trunk/drivers/net/macb.c | 8 + trunk/drivers/net/mv643xx_eth.c | 17 +- trunk/drivers/net/myri10ge/myri10ge.c | 15 +- trunk/drivers/net/netxen/netxen_nic.h | 12 +- trunk/drivers/net/netxen/netxen_nic_ethtool.c | 5 +- trunk/drivers/net/netxen/netxen_nic_main.c | 31 +- trunk/drivers/net/phy/mdio_bus.c | 8 +- trunk/drivers/net/phy/smsc.c | 12 + trunk/drivers/net/tg3.c | 81 +- trunk/drivers/net/tg3.h | 1 + trunk/drivers/net/usb/mcs7830.c | 20 +- trunk/drivers/net/via-velocity.c | 2 +- trunk/drivers/net/virtio_net.c | 3 +- trunk/drivers/net/wimax/i2400m/control.c | 2 +- trunk/drivers/net/wimax/i2400m/usb-rx.c | 9 +- trunk/drivers/net/wireless/ath9k/rc.c | 2 +- .../drivers/net/wireless/ath9k/regd_common.h | 2 +- .../net/wireless/iwlwifi/iwl-3945-rs.c | 14 +- .../drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 14 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-hcmd.c | 2 +- .../net/wireless/iwlwifi/iwl3945-base.c | 4 +- trunk/drivers/net/wireless/libertas/hostcmd.h | 91 +- trunk/drivers/net/wireless/orinoco/orinoco.c | 32 +- trunk/drivers/net/wireless/p54/p54common.c | 30 +- trunk/drivers/net/wireless/p54/p54usb.c | 41 +- trunk/drivers/net/wireless/rndis_wlan.c | 2 - .../drivers/net/wireless/rt2x00/rt2x00queue.c | 3 +- .../net/wireless/rt2x00/rt2x00rfkill.c | 2 +- .../net/wireless/rtl818x/rtl8187_dev.c | 1 + trunk/drivers/net/wireless/zd1211rw/zd_usb.c | 1 + trunk/drivers/oprofile/cpu_buffer.c | 5 + trunk/drivers/oprofile/cpu_buffer.h | 7 + trunk/drivers/pci/hotplug/pciehp_core.c | 4 +- trunk/drivers/pci/msi.c | 16 +- trunk/drivers/pci/pci-driver.c | 91 +- trunk/drivers/pci/pci.c | 63 +- trunk/drivers/pci/pci.h | 6 + trunk/drivers/power/pda_power.c | 2 +- trunk/drivers/s390/net/lcs.c | 8 +- trunk/drivers/serial/sh-sci.h | 5 +- trunk/drivers/video/Kconfig | 12 + trunk/drivers/video/Makefile | 1 + trunk/drivers/video/mx3fb.c | 1555 +++++++++++++++ trunk/drivers/xen/balloon.c | 8 + trunk/drivers/xen/xenfs/xenbus.c | 11 +- trunk/fs/9p/Kconfig | 10 + trunk/fs/Kconfig | 1401 +------------ trunk/fs/adfs/Kconfig | 27 + trunk/fs/affs/Kconfig | 21 + trunk/fs/afs/Kconfig | 21 + trunk/fs/autofs/Kconfig | 21 + trunk/fs/autofs4/Kconfig | 20 + trunk/fs/befs/Kconfig | 26 + trunk/fs/bfs/Kconfig | 19 + trunk/fs/btrfs/Kconfig | 18 + trunk/fs/coda/Kconfig | 21 + trunk/fs/configfs/Kconfig | 11 + trunk/fs/cramfs/Kconfig | 19 + trunk/fs/dlm/plock.c | 6 +- trunk/fs/dquot.c | 218 ++- trunk/fs/ecryptfs/Kconfig | 11 + trunk/fs/efs/Kconfig | 14 + trunk/fs/fat/Kconfig | 97 + trunk/fs/freevxfs/Kconfig | 16 + trunk/fs/fuse/Kconfig | 15 + trunk/fs/fuse/dev.c | 16 +- trunk/fs/fuse/file.c | 2 +- trunk/fs/fuse/inode.c | 30 +- trunk/fs/hfs/Kconfig | 12 + trunk/fs/hfsplus/Kconfig | 13 + trunk/fs/hpfs/Kconfig | 14 + trunk/fs/isofs/Kconfig | 39 + trunk/fs/jfs/Kconfig | 49 + trunk/fs/minix/Kconfig | 17 + trunk/fs/ncpfs/Kconfig | 21 + trunk/fs/nfs/Kconfig | 86 + trunk/fs/nfsd/Kconfig | 80 + trunk/fs/notify/inotify/inotify_user.c | 135 +- trunk/fs/ntfs/Kconfig | 78 + trunk/fs/ocfs2/Kconfig | 85 + trunk/fs/ocfs2/quota_global.c | 169 +- trunk/fs/omfs/Kconfig | 13 + trunk/fs/qnx4/Kconfig | 25 + trunk/fs/reiserfs/Kconfig | 85 + trunk/fs/romfs/Kconfig | 16 + trunk/fs/smbfs/Kconfig | 55 + trunk/fs/squashfs/Kconfig | 51 + trunk/fs/sysfs/Kconfig | 23 + trunk/fs/sysfs/bin.c | 6 + trunk/fs/sysv/Kconfig | 36 + trunk/fs/udf/Kconfig | 18 + trunk/fs/ufs/Kconfig | 43 + trunk/fs/xfs/Kconfig | 1 + trunk/fs/xfs/linux-2.6/xfs_ioctl.c | 305 ++- trunk/fs/xfs/linux-2.6/xfs_ioctl.h | 15 +- trunk/fs/xfs/linux-2.6/xfs_ioctl32.c | 184 +- trunk/fs/xfs/linux-2.6/xfs_super.c | 17 +- trunk/fs/xfs/quota/xfs_dquot.c | 38 +- trunk/fs/xfs/quota/xfs_dquot.h | 10 + trunk/fs/xfs/quota/xfs_qm.c | 9 + trunk/fs/xfs/xfs_ag.h | 6 +- trunk/fs/xfs/xfs_alloc_btree.c | 2 +- trunk/fs/xfs/xfs_attr.c | 26 +- trunk/fs/xfs/xfs_bmap.c | 166 +- trunk/fs/xfs/xfs_bmap.h | 2 - trunk/fs/xfs/xfs_bmap_btree.c | 10 +- trunk/fs/xfs/xfs_bmap_btree.h | 4 - trunk/fs/xfs/xfs_btree.c | 16 +- trunk/fs/xfs/xfs_da_btree.c | 8 +- trunk/fs/xfs/xfs_ialloc.c | 6 +- trunk/fs/xfs/xfs_ialloc.h | 2 - trunk/fs/xfs/xfs_ialloc_btree.h | 1 - trunk/fs/xfs/xfs_inode.c | 19 +- trunk/fs/xfs/xfs_inode_item.h | 4 - trunk/fs/xfs/xfs_iomap.c | 10 +- trunk/fs/xfs/xfs_itable.c | 6 +- trunk/fs/xfs/xfs_mount.c | 26 +- trunk/fs/xfs/xfs_mount.h | 9 +- trunk/fs/xfs/xfs_rename.c | 2 +- trunk/fs/xfs/xfs_rtalloc.c | 2 +- trunk/fs/xfs/xfs_rw.h | 1 - trunk/fs/xfs/xfs_sb.h | 2 +- trunk/fs/xfs/xfs_vnodeops.c | 20 +- trunk/include/asm-generic/bitops/__ffs.h | 2 +- trunk/include/asm-generic/bitops/__fls.h | 2 +- trunk/include/asm-generic/bitops/fls.h | 2 +- trunk/include/asm-generic/bitops/fls64.h | 4 +- trunk/include/asm-m68k/auxvec.h | 4 - trunk/include/asm-m68k/device.h | 7 - trunk/include/asm-m68k/emergency-restart.h | 6 - trunk/include/asm-m68k/futex.h | 6 - trunk/include/asm-m68k/ioctl.h | 1 - trunk/include/asm-m68k/irq_regs.h | 1 - trunk/include/asm-m68k/kdebug.h | 1 - trunk/include/asm-m68k/mutex.h | 9 - trunk/include/asm-m68k/topology.h | 6 - trunk/include/drm/drm_crtc.h | 3 +- trunk/include/linux/debugfs.h | 7 + trunk/include/linux/dmaengine.h | 11 +- trunk/include/linux/if_frad.h | 10 +- trunk/include/linux/init_task.h | 6 + trunk/include/linux/klist.h | 2 +- trunk/include/linux/pci.h | 5 + trunk/include/linux/quotaops.h | 2 - trunk/include/linux/sched.h | 32 +- trunk/include/linux/usb/usbnet.h | 4 +- trunk/include/linux/workqueue.h | 12 + trunk/include/net/mac80211.h | 1 - trunk/include/net/sctp/checksum.h | 2 +- trunk/include/sound/soc-dapm.h | 2 +- trunk/init/Kconfig | 194 +- trunk/kernel/dma-coherent.c | 47 +- trunk/kernel/fork.c | 16 +- trunk/kernel/hrtimer.c | 4 +- trunk/kernel/kallsyms.c | 16 +- trunk/kernel/posix-cpu-timers.c | 70 - trunk/kernel/rcuclassic.c | 2 +- trunk/kernel/rcutree.c | 2 +- trunk/kernel/relay.c | 4 +- trunk/kernel/sched_stats.h | 33 +- trunk/kernel/softlockup.c | 9 + trunk/kernel/sysctl.c | 2 +- trunk/kernel/time/tick-sched.c | 2 +- trunk/kernel/workqueue.c | 20 +- trunk/lib/Kconfig.debug | 22 +- trunk/mm/nommu.c | 20 +- trunk/net/8021q/vlan_core.c | 4 +- trunk/net/9p/client.c | 2 +- trunk/net/Kconfig | 8 - trunk/net/core/dev.c | 15 +- trunk/net/core/net_namespace.c | 2 +- trunk/net/core/skbuff.c | 70 +- trunk/net/ipv6/af_inet6.c | 7 + trunk/net/key/af_key.c | 1 + trunk/net/mac80211/mlme.c | 4 +- trunk/net/mac80211/sta_info.h | 1 - trunk/net/mac80211/tx.c | 6 +- trunk/net/netfilter/nf_conntrack_netlink.c | 3 + trunk/net/sctp/input.c | 13 + trunk/net/sctp/output.c | 7 +- trunk/net/sctp/outqueue.c | 3 +- trunk/net/sunrpc/Kconfig | 79 + trunk/net/wireless/reg.c | 128 +- trunk/net/xfrm/xfrm_user.c | 11 +- trunk/scripts/Makefile.build | 55 +- trunk/scripts/Makefile.modinst | 3 +- trunk/scripts/config | 4 + trunk/scripts/genksyms/genksyms.c | 21 +- trunk/scripts/genksyms/keywords.c_shipped | 189 +- trunk/scripts/genksyms/keywords.gperf | 2 - trunk/scripts/kallsyms.c | 21 +- trunk/scripts/mksysmap | 7 +- trunk/scripts/mod/file2alias.c | 17 +- trunk/scripts/strip-symbols | 22 - trunk/sound/pci/Kconfig | 4 +- trunk/sound/pci/hda/patch_realtek.c | 2 + trunk/sound/pci/hda/patch_sigmatel.c | 54 +- trunk/sound/pci/oxygen/virtuoso.c | 3 +- trunk/sound/soc/atmel/atmel-pcm.c | 2 - trunk/sound/soc/fsl/mpc8610_hpcd.c | 18 +- 678 files changed, 10669 insertions(+), 4678 deletions(-) create mode 100644 trunk/arch/arm/plat-mxc/include/mach/ipu.h create mode 100644 trunk/arch/arm/plat-mxc/include/mach/mx3fb.h rename trunk/{include/asm-m68k => arch/m68k/include/asm}/Kbuild (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/MC68328.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/MC68332.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/MC68EZ328.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/MC68VZ328.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/a.out-core.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/a.out.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/adb_iop.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/amigahw.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/amigaints.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/amigayle.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/amipcmcia.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/anchor.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/apollodma.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/apollohw.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/atafd.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/atafdreg.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/atari_joystick.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/atari_stdma.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/atari_stram.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/atarihw.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/atariints.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/atarikb.h (100%) create mode 100644 trunk/arch/m68k/include/asm/atomic.h rename trunk/{include/asm-m68k/atomic.h => arch/m68k/include/asm/atomic_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/atomic.h => m68k/include/asm/atomic_no.h} (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/auxvec.h (100%) create mode 100644 trunk/arch/m68k/include/asm/bitops.h rename trunk/{include/asm-m68k/bitops.h => arch/m68k/include/asm/bitops_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/bitops.h => m68k/include/asm/bitops_no.h} (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/blinken.h (100%) create mode 100644 trunk/arch/m68k/include/asm/bootinfo.h rename trunk/{include/asm-m68k/bootinfo.h => arch/m68k/include/asm/bootinfo_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/bootinfo.h => m68k/include/asm/bootinfo_no.h} (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/bootstd.h (100%) create mode 100644 trunk/arch/m68k/include/asm/bug.h rename trunk/{include/asm-m68k/bug.h => arch/m68k/include/asm/bug_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/bug.h => m68k/include/asm/bug_no.h} (100%) create mode 100644 trunk/arch/m68k/include/asm/bugs.h rename trunk/{include/asm-m68k/bugs.h => arch/m68k/include/asm/bugs_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/bugs.h => m68k/include/asm/bugs_no.h} (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/bvme6000hw.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/byteorder.h (100%) create mode 100644 trunk/arch/m68k/include/asm/cache.h rename trunk/{include/asm-m68k/cache.h => arch/m68k/include/asm/cache_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/cache.h => m68k/include/asm/cache_no.h} (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/cachectl.h (100%) create mode 100644 trunk/arch/m68k/include/asm/cacheflush.h rename trunk/{include/asm-m68k/cacheflush.h => arch/m68k/include/asm/cacheflush_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/cacheflush.h => m68k/include/asm/cacheflush_no.h} (100%) create mode 100644 trunk/arch/m68k/include/asm/checksum.h rename trunk/{include/asm-m68k/checksum.h => arch/m68k/include/asm/checksum_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/checksum.h => m68k/include/asm/checksum_no.h} (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/coldfire.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/commproc.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/contregs.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/cputime.h (100%) create mode 100644 trunk/arch/m68k/include/asm/current.h rename trunk/{include/asm-m68k/current.h => arch/m68k/include/asm/current_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/current.h => m68k/include/asm/current_no.h} (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/dbg.h (100%) create mode 100644 trunk/arch/m68k/include/asm/delay.h rename trunk/{include/asm-m68k/delay.h => arch/m68k/include/asm/delay_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/delay.h => m68k/include/asm/delay_no.h} (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/device.h (100%) create mode 100644 trunk/arch/m68k/include/asm/div64.h rename trunk/{include/asm-m68k/div64.h => arch/m68k/include/asm/div64_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/div64.h => m68k/include/asm/div64_no.h} (100%) create mode 100644 trunk/arch/m68k/include/asm/dma-mapping.h rename trunk/{include/asm-m68k/dma-mapping.h => arch/m68k/include/asm/dma-mapping_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/dma-mapping.h => m68k/include/asm/dma-mapping_no.h} (100%) create mode 100644 trunk/arch/m68k/include/asm/dma.h rename trunk/{include/asm-m68k/dma.h => arch/m68k/include/asm/dma_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/dma.h => m68k/include/asm/dma_no.h} (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/dsp56k.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/dvma.h (100%) create mode 100644 trunk/arch/m68k/include/asm/elf.h rename trunk/{include/asm-m68k/elf.h => arch/m68k/include/asm/elf_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/elf.h => m68k/include/asm/elf_no.h} (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/elia.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/emergency-restart.h (100%) create mode 100644 trunk/arch/m68k/include/asm/entry.h rename trunk/{include/asm-m68k/entry.h => arch/m68k/include/asm/entry_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/entry.h => m68k/include/asm/entry_no.h} (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/errno.h (100%) create mode 100644 trunk/arch/m68k/include/asm/fb.h rename trunk/{include/asm-m68k/fb.h => arch/m68k/include/asm/fb_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/fb.h => m68k/include/asm/fb_no.h} (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/fbio.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/fcntl.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/flat.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/floppy.h (100%) create mode 100644 trunk/arch/m68k/include/asm/fpu.h rename trunk/{include/asm-m68k/fpu.h => arch/m68k/include/asm/fpu_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/fpu.h => m68k/include/asm/fpu_no.h} (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/futex.h (100%) create mode 100644 trunk/arch/m68k/include/asm/hardirq.h rename trunk/{include/asm-m68k/hardirq.h => arch/m68k/include/asm/hardirq_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/hardirq.h => m68k/include/asm/hardirq_no.h} (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/hp300hw.h (100%) create mode 100644 trunk/arch/m68k/include/asm/hw_irq.h rename trunk/{include/asm-m68k/hw_irq.h => arch/m68k/include/asm/hw_irq_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/hw_irq.h => m68k/include/asm/hw_irq_no.h} (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/hwtest.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/ide.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/idprom.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/intersil.h (100%) create mode 100644 trunk/arch/m68k/include/asm/io.h rename trunk/{include/asm-m68k/io.h => arch/m68k/include/asm/io_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/io.h => m68k/include/asm/io_no.h} (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/ioctl.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/ioctls.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/ipcbuf.h (100%) create mode 100644 trunk/arch/m68k/include/asm/irq.h rename trunk/{include/asm-m68k/irq.h => arch/m68k/include/asm/irq_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/irq.h => m68k/include/asm/irq_no.h} (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/irq_regs.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/kdebug.h (100%) create mode 100644 trunk/arch/m68k/include/asm/kmap_types.h rename trunk/{include/asm-m68k/kmap_types.h => arch/m68k/include/asm/kmap_types_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/kmap_types.h => m68k/include/asm/kmap_types_no.h} (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/linkage.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/local.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/m5206sim.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/m520xsim.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/m523xsim.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/m5249sim.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/m5272sim.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/m527xsim.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/m528xsim.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/m5307sim.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/m532xsim.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/m5407sim.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/m68360.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/m68360_enet.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/m68360_pram.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/m68360_quicc.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/m68360_regs.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/mac_asc.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/mac_baboon.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/mac_iop.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/mac_mouse.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/mac_oss.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/mac_psc.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/mac_via.h (100%) create mode 100644 trunk/arch/m68k/include/asm/machdep.h rename trunk/{include/asm-m68k/machdep.h => arch/m68k/include/asm/machdep_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/machdep.h => m68k/include/asm/machdep_no.h} (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/machines.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/machw.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/macintosh.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/macints.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/math-emu.h (100%) create mode 100644 trunk/arch/m68k/include/asm/mc146818rtc.h rename trunk/{include/asm-m68k/mc146818rtc.h => arch/m68k/include/asm/mc146818rtc_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/mc146818rtc.h => m68k/include/asm/mc146818rtc_no.h} (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/mcfcache.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/mcfdma.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/mcfmbus.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/mcfne.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/mcfpci.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/mcfpit.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/mcfsim.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/mcfsmc.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/mcftimer.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/mcfuart.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/mcfwdebug.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/md.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/mman.h (100%) create mode 100644 trunk/arch/m68k/include/asm/mmu.h create mode 100644 trunk/arch/m68k/include/asm/mmu_context.h rename trunk/{include/asm-m68k/mmu_context.h => arch/m68k/include/asm/mmu_context_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/mmu_context.h => m68k/include/asm/mmu_context_no.h} (100%) rename trunk/{include/asm-m68k/mmu.h => arch/m68k/include/asm/mmu_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/mmu.h => m68k/include/asm/mmu_no.h} (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/mmzone.h (100%) create mode 100644 trunk/arch/m68k/include/asm/module.h rename trunk/{include/asm-m68k/module.h => arch/m68k/include/asm/module_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/module.h => m68k/include/asm/module_no.h} (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/motorola_pgalloc.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/motorola_pgtable.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/movs.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/msgbuf.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/mutex.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/mvme147hw.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/mvme16xhw.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/nettel.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/nubus.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/openprom.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/oplib.h (100%) create mode 100644 trunk/arch/m68k/include/asm/page.h rename trunk/{include/asm-m68k/page.h => arch/m68k/include/asm/page_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/page.h => m68k/include/asm/page_no.h} (100%) create mode 100644 trunk/arch/m68k/include/asm/page_offset.h rename trunk/{include/asm-m68k/page_offset.h => arch/m68k/include/asm/page_offset_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/page_offset.h => m68k/include/asm/page_offset_no.h} (100%) create mode 100644 trunk/arch/m68k/include/asm/param.h rename trunk/{include/asm-m68k/param.h => arch/m68k/include/asm/param_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/param.h => m68k/include/asm/param_no.h} (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/parport.h (100%) create mode 100644 trunk/arch/m68k/include/asm/pci.h rename trunk/{include/asm-m68k/pci.h => arch/m68k/include/asm/pci_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/pci.h => m68k/include/asm/pci_no.h} (96%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/percpu.h (100%) create mode 100644 trunk/arch/m68k/include/asm/pgalloc.h rename trunk/{include/asm-m68k/pgalloc.h => arch/m68k/include/asm/pgalloc_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/pgalloc.h => m68k/include/asm/pgalloc_no.h} (100%) create mode 100644 trunk/arch/m68k/include/asm/pgtable.h rename trunk/{include/asm-m68k/pgtable.h => arch/m68k/include/asm/pgtable_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/pgtable.h => m68k/include/asm/pgtable_no.h} (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/poll.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/posix_types.h (100%) create mode 100644 trunk/arch/m68k/include/asm/processor.h rename trunk/{include/asm-m68k/processor.h => arch/m68k/include/asm/processor_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/processor.h => m68k/include/asm/processor_no.h} (100%) create mode 100644 trunk/arch/m68k/include/asm/ptrace.h rename trunk/{include/asm-m68k/ptrace.h => arch/m68k/include/asm/ptrace_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/ptrace.h => m68k/include/asm/ptrace_no.h} (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/q40_master.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/q40ints.h (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/quicc_simple.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/raw_io.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/resource.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/rtc.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/sbus.h (100%) create mode 100644 trunk/arch/m68k/include/asm/scatterlist.h rename trunk/{include/asm-m68k/scatterlist.h => arch/m68k/include/asm/scatterlist_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/scatterlist.h => m68k/include/asm/scatterlist_no.h} (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/sections.h (100%) create mode 100644 trunk/arch/m68k/include/asm/segment.h rename trunk/{include/asm-m68k/segment.h => arch/m68k/include/asm/segment_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/segment.h => m68k/include/asm/segment_no.h} (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/sembuf.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/serial.h (100%) create mode 100644 trunk/arch/m68k/include/asm/setup.h rename trunk/{include/asm-m68k/setup.h => arch/m68k/include/asm/setup_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/setup.h => m68k/include/asm/setup_no.h} (84%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/shm.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/shmbuf.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/shmparam.h (100%) create mode 100644 trunk/arch/m68k/include/asm/sigcontext.h rename trunk/{include/asm-m68k/sigcontext.h => arch/m68k/include/asm/sigcontext_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/sigcontext.h => m68k/include/asm/sigcontext_no.h} (100%) create mode 100644 trunk/arch/m68k/include/asm/siginfo.h rename trunk/{include/asm-m68k/siginfo.h => arch/m68k/include/asm/siginfo_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/siginfo.h => m68k/include/asm/siginfo_no.h} (100%) create mode 100644 trunk/arch/m68k/include/asm/signal.h rename trunk/{include/asm-m68k/signal.h => arch/m68k/include/asm/signal_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/signal.h => m68k/include/asm/signal_no.h} (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/smp.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/socket.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/sockios.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/spinlock.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/stat.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/statfs.h (100%) create mode 100644 trunk/arch/m68k/include/asm/string.h rename trunk/{include/asm-m68k/string.h => arch/m68k/include/asm/string_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/string.h => m68k/include/asm/string_no.h} (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/sun3-head.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/sun3_pgalloc.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/sun3_pgtable.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/sun3ints.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/sun3mmu.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/sun3x.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/sun3xflop.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/sun3xprom.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/suspend.h (100%) create mode 100644 trunk/arch/m68k/include/asm/swab.h rename trunk/{include/asm-m68k/swab.h => arch/m68k/include/asm/swab_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/swab.h => m68k/include/asm/swab_no.h} (100%) create mode 100644 trunk/arch/m68k/include/asm/system.h rename trunk/{include/asm-m68k/system.h => arch/m68k/include/asm/system_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/system.h => m68k/include/asm/system_no.h} (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/termbits.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/termios.h (100%) create mode 100644 trunk/arch/m68k/include/asm/thread_info.h rename trunk/{include/asm-m68k/thread_info.h => arch/m68k/include/asm/thread_info_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/thread_info.h => m68k/include/asm/thread_info_no.h} (100%) create mode 100644 trunk/arch/m68k/include/asm/timex.h rename trunk/{include/asm-m68k/timex.h => arch/m68k/include/asm/timex_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/timex.h => m68k/include/asm/timex_no.h} (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/tlb.h (100%) create mode 100644 trunk/arch/m68k/include/asm/tlbflush.h rename trunk/{include/asm-m68k/tlbflush.h => arch/m68k/include/asm/tlbflush_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/tlbflush.h => m68k/include/asm/tlbflush_no.h} (100%) rename trunk/arch/{m68knommu => m68k}/include/asm/topology.h (100%) create mode 100644 trunk/arch/m68k/include/asm/traps.h rename trunk/{include/asm-m68k/traps.h => arch/m68k/include/asm/traps_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/traps.h => m68k/include/asm/traps_no.h} (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/types.h (100%) create mode 100644 trunk/arch/m68k/include/asm/uaccess.h rename trunk/{include/asm-m68k/uaccess.h => arch/m68k/include/asm/uaccess_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/uaccess.h => m68k/include/asm/uaccess_no.h} (100%) create mode 100644 trunk/arch/m68k/include/asm/ucontext.h rename trunk/{include/asm-m68k/ucontext.h => arch/m68k/include/asm/ucontext_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/ucontext.h => m68k/include/asm/ucontext_no.h} (100%) create mode 100644 trunk/arch/m68k/include/asm/unaligned.h rename trunk/{include/asm-m68k/unaligned.h => arch/m68k/include/asm/unaligned_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/unaligned.h => m68k/include/asm/unaligned_no.h} (100%) create mode 100644 trunk/arch/m68k/include/asm/unistd.h rename trunk/{include/asm-m68k/unistd.h => arch/m68k/include/asm/unistd_mm.h} (100%) rename trunk/arch/{m68knommu/include/asm/unistd.h => m68k/include/asm/unistd_no.h} (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/user.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/virtconvert.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/xor.h (100%) rename trunk/{include/asm-m68k => arch/m68k/include/asm}/zorro.h (100%) delete mode 100644 trunk/arch/m68knommu/include/asm/Kbuild delete mode 100644 trunk/arch/m68knommu/include/asm/byteorder.h delete mode 100644 trunk/arch/m68knommu/include/asm/cachectl.h delete mode 100644 trunk/arch/m68knommu/include/asm/cputime.h delete mode 100644 trunk/arch/m68knommu/include/asm/errno.h delete mode 100644 trunk/arch/m68knommu/include/asm/fcntl.h delete mode 100644 trunk/arch/m68knommu/include/asm/hwtest.h delete mode 100644 trunk/arch/m68knommu/include/asm/ioctls.h delete mode 100644 trunk/arch/m68knommu/include/asm/ipcbuf.h delete mode 100644 trunk/arch/m68knommu/include/asm/linkage.h delete mode 100644 trunk/arch/m68knommu/include/asm/local.h delete mode 100644 trunk/arch/m68knommu/include/asm/math-emu.h delete mode 100644 trunk/arch/m68knommu/include/asm/md.h delete mode 100644 trunk/arch/m68knommu/include/asm/mman.h delete mode 100644 trunk/arch/m68knommu/include/asm/movs.h delete mode 100644 trunk/arch/m68knommu/include/asm/msgbuf.h delete mode 100644 trunk/arch/m68knommu/include/asm/openprom.h delete mode 100644 trunk/arch/m68knommu/include/asm/oplib.h delete mode 100644 trunk/arch/m68knommu/include/asm/percpu.h delete mode 100644 trunk/arch/m68knommu/include/asm/poll.h delete mode 100644 trunk/arch/m68knommu/include/asm/posix_types.h delete mode 100644 trunk/arch/m68knommu/include/asm/resource.h delete mode 100644 trunk/arch/m68knommu/include/asm/rtc.h delete mode 100644 trunk/arch/m68knommu/include/asm/sections.h delete mode 100644 trunk/arch/m68knommu/include/asm/sembuf.h delete mode 100644 trunk/arch/m68knommu/include/asm/shm.h delete mode 100644 trunk/arch/m68knommu/include/asm/shmbuf.h delete mode 100644 trunk/arch/m68knommu/include/asm/shmparam.h delete mode 100644 trunk/arch/m68knommu/include/asm/socket.h delete mode 100644 trunk/arch/m68knommu/include/asm/sockios.h delete mode 100644 trunk/arch/m68knommu/include/asm/spinlock.h delete mode 100644 trunk/arch/m68knommu/include/asm/stat.h delete mode 100644 trunk/arch/m68knommu/include/asm/statfs.h delete mode 100644 trunk/arch/m68knommu/include/asm/termbits.h delete mode 100644 trunk/arch/m68knommu/include/asm/termios.h delete mode 100644 trunk/arch/m68knommu/include/asm/tlb.h delete mode 100644 trunk/arch/m68knommu/include/asm/types.h delete mode 100644 trunk/arch/m68knommu/include/asm/user.h delete mode 100644 trunk/arch/x86/scripts/strip-symbols create mode 100644 trunk/drivers/dma/ipu/Makefile create mode 100644 trunk/drivers/dma/ipu/ipu_idmac.c create mode 100644 trunk/drivers/dma/ipu/ipu_intern.h create mode 100644 trunk/drivers/dma/ipu/ipu_irq.c create mode 100644 trunk/drivers/video/mx3fb.c create mode 100644 trunk/fs/9p/Kconfig create mode 100644 trunk/fs/adfs/Kconfig create mode 100644 trunk/fs/affs/Kconfig create mode 100644 trunk/fs/afs/Kconfig create mode 100644 trunk/fs/autofs/Kconfig create mode 100644 trunk/fs/autofs4/Kconfig create mode 100644 trunk/fs/befs/Kconfig create mode 100644 trunk/fs/bfs/Kconfig create mode 100644 trunk/fs/btrfs/Kconfig create mode 100644 trunk/fs/coda/Kconfig create mode 100644 trunk/fs/configfs/Kconfig create mode 100644 trunk/fs/cramfs/Kconfig create mode 100644 trunk/fs/ecryptfs/Kconfig create mode 100644 trunk/fs/efs/Kconfig create mode 100644 trunk/fs/fat/Kconfig create mode 100644 trunk/fs/freevxfs/Kconfig create mode 100644 trunk/fs/fuse/Kconfig create mode 100644 trunk/fs/hfs/Kconfig create mode 100644 trunk/fs/hfsplus/Kconfig create mode 100644 trunk/fs/hpfs/Kconfig create mode 100644 trunk/fs/isofs/Kconfig create mode 100644 trunk/fs/jfs/Kconfig create mode 100644 trunk/fs/minix/Kconfig create mode 100644 trunk/fs/nfs/Kconfig create mode 100644 trunk/fs/nfsd/Kconfig create mode 100644 trunk/fs/ntfs/Kconfig create mode 100644 trunk/fs/ocfs2/Kconfig create mode 100644 trunk/fs/omfs/Kconfig create mode 100644 trunk/fs/qnx4/Kconfig create mode 100644 trunk/fs/reiserfs/Kconfig create mode 100644 trunk/fs/romfs/Kconfig create mode 100644 trunk/fs/smbfs/Kconfig create mode 100644 trunk/fs/squashfs/Kconfig create mode 100644 trunk/fs/sysfs/Kconfig create mode 100644 trunk/fs/sysv/Kconfig create mode 100644 trunk/fs/udf/Kconfig create mode 100644 trunk/fs/ufs/Kconfig delete mode 100644 trunk/include/asm-m68k/auxvec.h delete mode 100644 trunk/include/asm-m68k/device.h delete mode 100644 trunk/include/asm-m68k/emergency-restart.h delete mode 100644 trunk/include/asm-m68k/futex.h delete mode 100644 trunk/include/asm-m68k/ioctl.h delete mode 100644 trunk/include/asm-m68k/irq_regs.h delete mode 100644 trunk/include/asm-m68k/kdebug.h delete mode 100644 trunk/include/asm-m68k/mutex.h delete mode 100644 trunk/include/asm-m68k/topology.h create mode 100644 trunk/net/sunrpc/Kconfig delete mode 100644 trunk/scripts/strip-symbols diff --git a/[refs] b/[refs] index f200550bdb4c..4c05364c38cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5fb4523afbffae5a5cec4989ee4c9fbc3dbdef33 +refs/heads/master: cfb901bf84fe22eb86525e9fb20675b53fb0462a diff --git a/trunk/Documentation/kbuild/kbuild.txt b/trunk/Documentation/kbuild/kbuild.txt index 923f9ddee8f6..f3355b6812df 100644 --- a/trunk/Documentation/kbuild/kbuild.txt +++ b/trunk/Documentation/kbuild/kbuild.txt @@ -3,7 +3,7 @@ Environment variables KCPPFLAGS -------------------------------------------------- Additional options to pass when preprocessing. The preprocessing options -will be used in all cases where kbuild do preprocessing including +will be used in all cases where kbuild does preprocessing including building C files and assembler files. KAFLAGS @@ -16,7 +16,7 @@ Additional options to the C compiler. KBUILD_VERBOSE -------------------------------------------------- -Set the kbuild verbosity. Can be assinged same values as "V=...". +Set the kbuild verbosity. Can be assigned same values as "V=...". See make help for the full list. Setting "V=..." takes precedence over KBUILD_VERBOSE. @@ -35,14 +35,14 @@ KBUILD_OUTPUT -------------------------------------------------- Specify the output directory when building the kernel. The output directory can also be specificed using "O=...". -Setting "O=..." takes precedence over KBUILD_OUTPUT +Setting "O=..." takes precedence over KBUILD_OUTPUT. ARCH -------------------------------------------------- Set ARCH to the architecture to be built. In most cases the name of the architecture is the same as the directory name found in the arch/ directory. -But some architectures suach as x86 and sparc has aliases. +But some architectures such as x86 and sparc have aliases. x86: i386 for 32 bit, x86_64 for 64 bit sparc: sparc for 32 bit, sparc64 for 64 bit @@ -63,7 +63,7 @@ CF is often used on the command-line like this: INSTALL_PATH -------------------------------------------------- INSTALL_PATH specifies where to place the updated kernel and system map -images. Default is /boot, but you can set it to other values +images. Default is /boot, but you can set it to other values. MODLIB @@ -90,7 +90,7 @@ INSTALL_MOD_STRIP will used as the options to the strip command. INSTALL_FW_PATH -------------------------------------------------- -INSTALL_FW_PATH specify where to install the firmware blobs. +INSTALL_FW_PATH specifies where to install the firmware blobs. The default value is: $(INSTALL_MOD_PATH)/lib/firmware @@ -99,7 +99,7 @@ The value can be overridden in which case the default value is ignored. INSTALL_HDR_PATH -------------------------------------------------- -INSTALL_HDR_PATH specify where to install user space headers when +INSTALL_HDR_PATH specifies where to install user space headers when executing "make headers_*". The default value is: @@ -112,22 +112,23 @@ The value can be overridden in which case the default value is ignored. KBUILD_MODPOST_WARN -------------------------------------------------- -KBUILD_MODPOST_WARN can be set to avoid error out in case of undefined -symbols in the final module linking stage. +KBUILD_MODPOST_WARN can be set to avoid errors in case of undefined +symbols in the final module linking stage. It changes such errors +into warnings. -KBUILD_MODPOST_FINAL +KBUILD_MODPOST_NOFINAL -------------------------------------------------- KBUILD_MODPOST_NOFINAL can be set to skip the final link of modules. -This is solely usefull to speed up test compiles. +This is solely useful to speed up test compiles. KBUILD_EXTRA_SYMBOLS -------------------------------------------------- -For modules use symbols from another modules. +For modules that use symbols from other modules. See more details in modules.txt. ALLSOURCE_ARCHS -------------------------------------------------- -For tags/TAGS/cscope targets, you can specify more than one archs -to be included in the databases, separated by blankspace. e.g. +For tags/TAGS/cscope targets, you can specify more than one arch +to be included in the databases, separated by blank space. E.g.: $ make ALLSOURCE_ARCHS="x86 mips arm" tags diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 8511d3532c27..d8362cf9909e 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -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: ,,,,, - cs89x0_dma= [HW,NET] Format: @@ -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: ,[,[]] - 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. diff --git a/trunk/Documentation/networking/netconsole.txt b/trunk/Documentation/networking/netconsole.txt index 3c2f2b328638..8d022073e3ef 100644 --- a/trunk/Documentation/networking/netconsole.txt +++ b/trunk/Documentation/networking/netconsole.txt @@ -51,7 +51,8 @@ Built-in netconsole starts immediately after the TCP stack is initialized and attempts to bring up the supplied dev at the supplied address. -The remote host can run either 'netcat -u -l -p ' or syslogd. +The remote host can run either 'netcat -u -l -p ', +'nc -l -u ' or syslogd. Dynamic reconfiguration: ======================== diff --git a/trunk/Documentation/sound/alsa/HD-Audio-Models.txt b/trunk/Documentation/sound/alsa/HD-Audio-Models.txt index 64eb1100eec1..0f5d26bea80f 100644 --- a/trunk/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/trunk/Documentation/sound/alsa/HD-Audio-Models.txt @@ -349,6 +349,7 @@ STAC92HD73* STAC92HD83* =========== ref Reference board + mic-ref Reference board with power managment for ports STAC9872 ======== diff --git a/trunk/Makefile b/trunk/Makefile index 207303da3971..cf9e20dac86e 100644 --- a/trunk/Makefile +++ b/trunk/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 @@ -606,25 +610,20 @@ export INSTALL_PATH ?= /boot MODLIB = $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE) export MODLIB -strip-symbols := $(srctree)/scripts/strip-symbols \ - $(wildcard $(srctree)/arch/$(ARCH)/scripts/strip-symbols) - # -# INSTALL_MOD_STRIP, if defined, will cause modules to be stripped while -# they get installed. If INSTALL_MOD_STRIP is '1', then the default -# options (see below) will be used. Otherwise, INSTALL_MOD_STRIP will -# be used as the option(s) to the objcopy command. +# INSTALL_MOD_STRIP, if defined, will cause modules to be +# stripped after they are installed. If INSTALL_MOD_STRIP is '1', then +# the default option --strip-debug will be used. Otherwise, +# INSTALL_MOD_STRIP will used as the options to the strip command. + ifdef INSTALL_MOD_STRIP ifeq ($(INSTALL_MOD_STRIP),1) -mod_strip_cmd = $(OBJCOPY) --strip-debug -ifeq ($(CONFIG_KALLSYMS_ALL),$(CONFIG_KALLSYMS_STRIP_GENERATED)) -mod_strip_cmd += --wildcard $(addprefix --strip-symbols ,$(strip-symbols)) -endif +mod_strip_cmd = $(STRIP) --strip-debug else -mod_strip_cmd = $(OBJCOPY) $(INSTALL_MOD_STRIP) +mod_strip_cmd = $(STRIP) $(INSTALL_MOD_STRIP) endif # INSTALL_MOD_STRIP=1 else -mod_strip_cmd = false +mod_strip_cmd = true endif # INSTALL_MOD_STRIP export mod_strip_cmd @@ -754,7 +753,6 @@ last_kallsyms := 2 endif kallsyms.o := .tmp_kallsyms$(last_kallsyms).o -kallsyms.h := $(wildcard include/config/kallsyms/*.h) $(wildcard include/config/kallsyms/*/*.h) define verify_kallsyms $(Q)$(if $($(quiet)cmd_sysmap), \ @@ -779,41 +777,24 @@ endef # Generate .S file with all kernel symbols quiet_cmd_kallsyms = KSYM $@ - cmd_kallsyms = { test $* -eq 0 || $(NM) -n $<; } \ - | $(KALLSYMS) $(if $(CONFIG_KALLSYMS_ALL),--all-symbols) >$@ + cmd_kallsyms = $(NM) -n $< | $(KALLSYMS) \ + $(if $(CONFIG_KALLSYMS_ALL),--all-symbols) > $@ -quiet_cmd_kstrip = STRIP $@ - cmd_kstrip = $(OBJCOPY) --wildcard $(addprefix --strip$(if $(CONFIG_RELOCATABLE),-unneeded)-symbols ,$(filter %/scripts/strip-symbols,$^)) $< $@ - -$(foreach n,0 1 2 3,.tmp_kallsyms$(n).o): KBUILD_AFLAGS += -Wa,--strip-local-absolute -$(foreach n,0 1 2 3,.tmp_kallsyms$(n).o): %.o: %.S scripts FORCE +.tmp_kallsyms1.o .tmp_kallsyms2.o .tmp_kallsyms3.o: %.o: %.S scripts FORCE $(call if_changed_dep,as_o_S) -ifeq ($(CONFIG_KALLSYMS_STRIP_GENERATED),y) -strip-ext := .stripped -endif - -.tmp_kallsyms%.S: .tmp_vmlinux%$(strip-ext) $(KALLSYMS) $(kallsyms.h) +.tmp_kallsyms%.S: .tmp_vmlinux% $(KALLSYMS) $(call cmd,kallsyms) -# make -jN seems to have problems with intermediate files, see bug #3330. -.SECONDARY: $(foreach n,1 2 3,.tmp_vmlinux$(n).stripped) -.tmp_vmlinux%.stripped: .tmp_vmlinux% $(strip-symbols) $(kallsyms.h) - $(call cmd,kstrip) - -ifneq ($(CONFIG_DEBUG_INFO),y) -.tmp_vmlinux%: LDFLAGS_vmlinux += -S -endif # .tmp_vmlinux1 must be complete except kallsyms, so update vmlinux version -.tmp_vmlinux%: $(vmlinux-lds) $(vmlinux-all) FORCE - $(if $(filter 1,$*),$(call if_changed_rule,ksym_ld),$(call if_changed,vmlinux__)) +.tmp_vmlinux1: $(vmlinux-lds) $(vmlinux-all) FORCE + $(call if_changed_rule,ksym_ld) -.tmp_vmlinux0$(strip-ext): - $(Q)echo "placeholder" >$@ +.tmp_vmlinux2: $(vmlinux-lds) $(vmlinux-all) .tmp_kallsyms1.o FORCE + $(call if_changed,vmlinux__) -.tmp_vmlinux1: .tmp_kallsyms0.o -.tmp_vmlinux2: .tmp_kallsyms1.o -.tmp_vmlinux3: .tmp_kallsyms2.o +.tmp_vmlinux3: $(vmlinux-lds) $(vmlinux-all) .tmp_kallsyms2.o FORCE + $(call if_changed,vmlinux__) # Needs to visit scripts/ before $(KALLSYMS) can be used. $(KALLSYMS): scripts ; diff --git a/trunk/arch/arm/plat-mxc/include/mach/ipu.h b/trunk/arch/arm/plat-mxc/include/mach/ipu.h new file mode 100644 index 000000000000..a9221f1cc1a0 --- /dev/null +++ b/trunk/arch/arm/plat-mxc/include/mach/ipu.h @@ -0,0 +1,181 @@ +/* + * Copyright (C) 2008 + * Guennadi Liakhovetski, DENX Software Engineering, + * + * 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 +#include + +/* 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 diff --git a/trunk/arch/arm/plat-mxc/include/mach/irqs.h b/trunk/arch/arm/plat-mxc/include/mach/irqs.h index e06d3cb0ee11..c02b8fc2d821 100644 --- a/trunk/arch/arm/plat-mxc/include/mach/irqs.h +++ b/trunk/arch/arm/plat-mxc/include/mach/irqs.h @@ -35,7 +35,15 @@ #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/trunk/arch/arm/plat-mxc/include/mach/mx3fb.h b/trunk/arch/arm/plat-mxc/include/mach/mx3fb.h new file mode 100644 index 000000000000..e391a76ca87d --- /dev/null +++ b/trunk/arch/arm/plat-mxc/include/mach/mx3fb.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2008 + * Guennadi Liakhovetski, DENX Software Engineering, + * + * 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 +#include + +/* 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/trunk/include/asm-m68k/Kbuild b/trunk/arch/m68k/include/asm/Kbuild similarity index 100% rename from trunk/include/asm-m68k/Kbuild rename to trunk/arch/m68k/include/asm/Kbuild diff --git a/trunk/arch/m68knommu/include/asm/MC68328.h b/trunk/arch/m68k/include/asm/MC68328.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/MC68328.h rename to trunk/arch/m68k/include/asm/MC68328.h diff --git a/trunk/arch/m68knommu/include/asm/MC68332.h b/trunk/arch/m68k/include/asm/MC68332.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/MC68332.h rename to trunk/arch/m68k/include/asm/MC68332.h diff --git a/trunk/arch/m68knommu/include/asm/MC68EZ328.h b/trunk/arch/m68k/include/asm/MC68EZ328.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/MC68EZ328.h rename to trunk/arch/m68k/include/asm/MC68EZ328.h diff --git a/trunk/arch/m68knommu/include/asm/MC68VZ328.h b/trunk/arch/m68k/include/asm/MC68VZ328.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/MC68VZ328.h rename to trunk/arch/m68k/include/asm/MC68VZ328.h diff --git a/trunk/include/asm-m68k/a.out-core.h b/trunk/arch/m68k/include/asm/a.out-core.h similarity index 100% rename from trunk/include/asm-m68k/a.out-core.h rename to trunk/arch/m68k/include/asm/a.out-core.h diff --git a/trunk/include/asm-m68k/a.out.h b/trunk/arch/m68k/include/asm/a.out.h similarity index 100% rename from trunk/include/asm-m68k/a.out.h rename to trunk/arch/m68k/include/asm/a.out.h diff --git a/trunk/include/asm-m68k/adb_iop.h b/trunk/arch/m68k/include/asm/adb_iop.h similarity index 100% rename from trunk/include/asm-m68k/adb_iop.h rename to trunk/arch/m68k/include/asm/adb_iop.h diff --git a/trunk/include/asm-m68k/amigahw.h b/trunk/arch/m68k/include/asm/amigahw.h similarity index 100% rename from trunk/include/asm-m68k/amigahw.h rename to trunk/arch/m68k/include/asm/amigahw.h diff --git a/trunk/include/asm-m68k/amigaints.h b/trunk/arch/m68k/include/asm/amigaints.h similarity index 100% rename from trunk/include/asm-m68k/amigaints.h rename to trunk/arch/m68k/include/asm/amigaints.h diff --git a/trunk/include/asm-m68k/amigayle.h b/trunk/arch/m68k/include/asm/amigayle.h similarity index 100% rename from trunk/include/asm-m68k/amigayle.h rename to trunk/arch/m68k/include/asm/amigayle.h diff --git a/trunk/include/asm-m68k/amipcmcia.h b/trunk/arch/m68k/include/asm/amipcmcia.h similarity index 100% rename from trunk/include/asm-m68k/amipcmcia.h rename to trunk/arch/m68k/include/asm/amipcmcia.h diff --git a/trunk/arch/m68knommu/include/asm/anchor.h b/trunk/arch/m68k/include/asm/anchor.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/anchor.h rename to trunk/arch/m68k/include/asm/anchor.h diff --git a/trunk/include/asm-m68k/apollodma.h b/trunk/arch/m68k/include/asm/apollodma.h similarity index 100% rename from trunk/include/asm-m68k/apollodma.h rename to trunk/arch/m68k/include/asm/apollodma.h diff --git a/trunk/include/asm-m68k/apollohw.h b/trunk/arch/m68k/include/asm/apollohw.h similarity index 100% rename from trunk/include/asm-m68k/apollohw.h rename to trunk/arch/m68k/include/asm/apollohw.h diff --git a/trunk/include/asm-m68k/atafd.h b/trunk/arch/m68k/include/asm/atafd.h similarity index 100% rename from trunk/include/asm-m68k/atafd.h rename to trunk/arch/m68k/include/asm/atafd.h diff --git a/trunk/include/asm-m68k/atafdreg.h b/trunk/arch/m68k/include/asm/atafdreg.h similarity index 100% rename from trunk/include/asm-m68k/atafdreg.h rename to trunk/arch/m68k/include/asm/atafdreg.h diff --git a/trunk/include/asm-m68k/atari_joystick.h b/trunk/arch/m68k/include/asm/atari_joystick.h similarity index 100% rename from trunk/include/asm-m68k/atari_joystick.h rename to trunk/arch/m68k/include/asm/atari_joystick.h diff --git a/trunk/include/asm-m68k/atari_stdma.h b/trunk/arch/m68k/include/asm/atari_stdma.h similarity index 100% rename from trunk/include/asm-m68k/atari_stdma.h rename to trunk/arch/m68k/include/asm/atari_stdma.h diff --git a/trunk/include/asm-m68k/atari_stram.h b/trunk/arch/m68k/include/asm/atari_stram.h similarity index 100% rename from trunk/include/asm-m68k/atari_stram.h rename to trunk/arch/m68k/include/asm/atari_stram.h diff --git a/trunk/include/asm-m68k/atarihw.h b/trunk/arch/m68k/include/asm/atarihw.h similarity index 100% rename from trunk/include/asm-m68k/atarihw.h rename to trunk/arch/m68k/include/asm/atarihw.h diff --git a/trunk/include/asm-m68k/atariints.h b/trunk/arch/m68k/include/asm/atariints.h similarity index 100% rename from trunk/include/asm-m68k/atariints.h rename to trunk/arch/m68k/include/asm/atariints.h diff --git a/trunk/include/asm-m68k/atarikb.h b/trunk/arch/m68k/include/asm/atarikb.h similarity index 100% rename from trunk/include/asm-m68k/atarikb.h rename to trunk/arch/m68k/include/asm/atarikb.h diff --git a/trunk/arch/m68k/include/asm/atomic.h b/trunk/arch/m68k/include/asm/atomic.h new file mode 100644 index 000000000000..8d29145ebb27 --- /dev/null +++ b/trunk/arch/m68k/include/asm/atomic.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "atomic_no.h" +#else +#include "atomic_mm.h" +#endif diff --git a/trunk/include/asm-m68k/atomic.h b/trunk/arch/m68k/include/asm/atomic_mm.h similarity index 100% rename from trunk/include/asm-m68k/atomic.h rename to trunk/arch/m68k/include/asm/atomic_mm.h diff --git a/trunk/arch/m68knommu/include/asm/atomic.h b/trunk/arch/m68k/include/asm/atomic_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/atomic.h rename to trunk/arch/m68k/include/asm/atomic_no.h diff --git a/trunk/arch/m68knommu/include/asm/auxvec.h b/trunk/arch/m68k/include/asm/auxvec.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/auxvec.h rename to trunk/arch/m68k/include/asm/auxvec.h diff --git a/trunk/arch/m68k/include/asm/bitops.h b/trunk/arch/m68k/include/asm/bitops.h new file mode 100644 index 000000000000..ce163abddaba --- /dev/null +++ b/trunk/arch/m68k/include/asm/bitops.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "bitops_no.h" +#else +#include "bitops_mm.h" +#endif diff --git a/trunk/include/asm-m68k/bitops.h b/trunk/arch/m68k/include/asm/bitops_mm.h similarity index 100% rename from trunk/include/asm-m68k/bitops.h rename to trunk/arch/m68k/include/asm/bitops_mm.h diff --git a/trunk/arch/m68knommu/include/asm/bitops.h b/trunk/arch/m68k/include/asm/bitops_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/bitops.h rename to trunk/arch/m68k/include/asm/bitops_no.h diff --git a/trunk/include/asm-m68k/blinken.h b/trunk/arch/m68k/include/asm/blinken.h similarity index 100% rename from trunk/include/asm-m68k/blinken.h rename to trunk/arch/m68k/include/asm/blinken.h diff --git a/trunk/arch/m68k/include/asm/bootinfo.h b/trunk/arch/m68k/include/asm/bootinfo.h new file mode 100644 index 000000000000..fedf3e326121 --- /dev/null +++ b/trunk/arch/m68k/include/asm/bootinfo.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "bootinfo_no.h" +#else +#include "bootinfo_mm.h" +#endif diff --git a/trunk/include/asm-m68k/bootinfo.h b/trunk/arch/m68k/include/asm/bootinfo_mm.h similarity index 100% rename from trunk/include/asm-m68k/bootinfo.h rename to trunk/arch/m68k/include/asm/bootinfo_mm.h diff --git a/trunk/arch/m68knommu/include/asm/bootinfo.h b/trunk/arch/m68k/include/asm/bootinfo_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/bootinfo.h rename to trunk/arch/m68k/include/asm/bootinfo_no.h diff --git a/trunk/arch/m68knommu/include/asm/bootstd.h b/trunk/arch/m68k/include/asm/bootstd.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/bootstd.h rename to trunk/arch/m68k/include/asm/bootstd.h diff --git a/trunk/arch/m68k/include/asm/bug.h b/trunk/arch/m68k/include/asm/bug.h new file mode 100644 index 000000000000..997e0944ebc1 --- /dev/null +++ b/trunk/arch/m68k/include/asm/bug.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "bug_no.h" +#else +#include "bug_mm.h" +#endif diff --git a/trunk/include/asm-m68k/bug.h b/trunk/arch/m68k/include/asm/bug_mm.h similarity index 100% rename from trunk/include/asm-m68k/bug.h rename to trunk/arch/m68k/include/asm/bug_mm.h diff --git a/trunk/arch/m68knommu/include/asm/bug.h b/trunk/arch/m68k/include/asm/bug_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/bug.h rename to trunk/arch/m68k/include/asm/bug_no.h diff --git a/trunk/arch/m68k/include/asm/bugs.h b/trunk/arch/m68k/include/asm/bugs.h new file mode 100644 index 000000000000..01f047d784ec --- /dev/null +++ b/trunk/arch/m68k/include/asm/bugs.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "bugs_no.h" +#else +#include "bugs_mm.h" +#endif diff --git a/trunk/include/asm-m68k/bugs.h b/trunk/arch/m68k/include/asm/bugs_mm.h similarity index 100% rename from trunk/include/asm-m68k/bugs.h rename to trunk/arch/m68k/include/asm/bugs_mm.h diff --git a/trunk/arch/m68knommu/include/asm/bugs.h b/trunk/arch/m68k/include/asm/bugs_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/bugs.h rename to trunk/arch/m68k/include/asm/bugs_no.h diff --git a/trunk/include/asm-m68k/bvme6000hw.h b/trunk/arch/m68k/include/asm/bvme6000hw.h similarity index 100% rename from trunk/include/asm-m68k/bvme6000hw.h rename to trunk/arch/m68k/include/asm/bvme6000hw.h diff --git a/trunk/include/asm-m68k/byteorder.h b/trunk/arch/m68k/include/asm/byteorder.h similarity index 100% rename from trunk/include/asm-m68k/byteorder.h rename to trunk/arch/m68k/include/asm/byteorder.h diff --git a/trunk/arch/m68k/include/asm/cache.h b/trunk/arch/m68k/include/asm/cache.h new file mode 100644 index 000000000000..599c29bc8f40 --- /dev/null +++ b/trunk/arch/m68k/include/asm/cache.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "cache_no.h" +#else +#include "cache_mm.h" +#endif diff --git a/trunk/include/asm-m68k/cache.h b/trunk/arch/m68k/include/asm/cache_mm.h similarity index 100% rename from trunk/include/asm-m68k/cache.h rename to trunk/arch/m68k/include/asm/cache_mm.h diff --git a/trunk/arch/m68knommu/include/asm/cache.h b/trunk/arch/m68k/include/asm/cache_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/cache.h rename to trunk/arch/m68k/include/asm/cache_no.h diff --git a/trunk/include/asm-m68k/cachectl.h b/trunk/arch/m68k/include/asm/cachectl.h similarity index 100% rename from trunk/include/asm-m68k/cachectl.h rename to trunk/arch/m68k/include/asm/cachectl.h diff --git a/trunk/arch/m68k/include/asm/cacheflush.h b/trunk/arch/m68k/include/asm/cacheflush.h new file mode 100644 index 000000000000..a70d7319630a --- /dev/null +++ b/trunk/arch/m68k/include/asm/cacheflush.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "cacheflush_no.h" +#else +#include "cacheflush_mm.h" +#endif diff --git a/trunk/include/asm-m68k/cacheflush.h b/trunk/arch/m68k/include/asm/cacheflush_mm.h similarity index 100% rename from trunk/include/asm-m68k/cacheflush.h rename to trunk/arch/m68k/include/asm/cacheflush_mm.h diff --git a/trunk/arch/m68knommu/include/asm/cacheflush.h b/trunk/arch/m68k/include/asm/cacheflush_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/cacheflush.h rename to trunk/arch/m68k/include/asm/cacheflush_no.h diff --git a/trunk/arch/m68k/include/asm/checksum.h b/trunk/arch/m68k/include/asm/checksum.h new file mode 100644 index 000000000000..1cf544767453 --- /dev/null +++ b/trunk/arch/m68k/include/asm/checksum.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "checksum_no.h" +#else +#include "checksum_mm.h" +#endif diff --git a/trunk/include/asm-m68k/checksum.h b/trunk/arch/m68k/include/asm/checksum_mm.h similarity index 100% rename from trunk/include/asm-m68k/checksum.h rename to trunk/arch/m68k/include/asm/checksum_mm.h diff --git a/trunk/arch/m68knommu/include/asm/checksum.h b/trunk/arch/m68k/include/asm/checksum_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/checksum.h rename to trunk/arch/m68k/include/asm/checksum_no.h diff --git a/trunk/arch/m68knommu/include/asm/coldfire.h b/trunk/arch/m68k/include/asm/coldfire.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/coldfire.h rename to trunk/arch/m68k/include/asm/coldfire.h diff --git a/trunk/arch/m68knommu/include/asm/commproc.h b/trunk/arch/m68k/include/asm/commproc.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/commproc.h rename to trunk/arch/m68k/include/asm/commproc.h diff --git a/trunk/include/asm-m68k/contregs.h b/trunk/arch/m68k/include/asm/contregs.h similarity index 100% rename from trunk/include/asm-m68k/contregs.h rename to trunk/arch/m68k/include/asm/contregs.h diff --git a/trunk/include/asm-m68k/cputime.h b/trunk/arch/m68k/include/asm/cputime.h similarity index 100% rename from trunk/include/asm-m68k/cputime.h rename to trunk/arch/m68k/include/asm/cputime.h diff --git a/trunk/arch/m68k/include/asm/current.h b/trunk/arch/m68k/include/asm/current.h new file mode 100644 index 000000000000..51b056dfaedd --- /dev/null +++ b/trunk/arch/m68k/include/asm/current.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "current_no.h" +#else +#include "current_mm.h" +#endif diff --git a/trunk/include/asm-m68k/current.h b/trunk/arch/m68k/include/asm/current_mm.h similarity index 100% rename from trunk/include/asm-m68k/current.h rename to trunk/arch/m68k/include/asm/current_mm.h diff --git a/trunk/arch/m68knommu/include/asm/current.h b/trunk/arch/m68k/include/asm/current_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/current.h rename to trunk/arch/m68k/include/asm/current_no.h diff --git a/trunk/arch/m68knommu/include/asm/dbg.h b/trunk/arch/m68k/include/asm/dbg.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/dbg.h rename to trunk/arch/m68k/include/asm/dbg.h diff --git a/trunk/arch/m68k/include/asm/delay.h b/trunk/arch/m68k/include/asm/delay.h new file mode 100644 index 000000000000..d2598e3dd7b2 --- /dev/null +++ b/trunk/arch/m68k/include/asm/delay.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "delay_no.h" +#else +#include "delay_mm.h" +#endif diff --git a/trunk/include/asm-m68k/delay.h b/trunk/arch/m68k/include/asm/delay_mm.h similarity index 100% rename from trunk/include/asm-m68k/delay.h rename to trunk/arch/m68k/include/asm/delay_mm.h diff --git a/trunk/arch/m68knommu/include/asm/delay.h b/trunk/arch/m68k/include/asm/delay_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/delay.h rename to trunk/arch/m68k/include/asm/delay_no.h diff --git a/trunk/arch/m68knommu/include/asm/device.h b/trunk/arch/m68k/include/asm/device.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/device.h rename to trunk/arch/m68k/include/asm/device.h diff --git a/trunk/arch/m68k/include/asm/div64.h b/trunk/arch/m68k/include/asm/div64.h new file mode 100644 index 000000000000..d211d9f54276 --- /dev/null +++ b/trunk/arch/m68k/include/asm/div64.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "div64_no.h" +#else +#include "div64_mm.h" +#endif diff --git a/trunk/include/asm-m68k/div64.h b/trunk/arch/m68k/include/asm/div64_mm.h similarity index 100% rename from trunk/include/asm-m68k/div64.h rename to trunk/arch/m68k/include/asm/div64_mm.h diff --git a/trunk/arch/m68knommu/include/asm/div64.h b/trunk/arch/m68k/include/asm/div64_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/div64.h rename to trunk/arch/m68k/include/asm/div64_no.h diff --git a/trunk/arch/m68k/include/asm/dma-mapping.h b/trunk/arch/m68k/include/asm/dma-mapping.h new file mode 100644 index 000000000000..f4a4c7638f89 --- /dev/null +++ b/trunk/arch/m68k/include/asm/dma-mapping.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "dma-mapping_no.h" +#else +#include "dma-mapping_mm.h" +#endif diff --git a/trunk/include/asm-m68k/dma-mapping.h b/trunk/arch/m68k/include/asm/dma-mapping_mm.h similarity index 100% rename from trunk/include/asm-m68k/dma-mapping.h rename to trunk/arch/m68k/include/asm/dma-mapping_mm.h diff --git a/trunk/arch/m68knommu/include/asm/dma-mapping.h b/trunk/arch/m68k/include/asm/dma-mapping_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/dma-mapping.h rename to trunk/arch/m68k/include/asm/dma-mapping_no.h diff --git a/trunk/arch/m68k/include/asm/dma.h b/trunk/arch/m68k/include/asm/dma.h new file mode 100644 index 000000000000..b82e660cf1c2 --- /dev/null +++ b/trunk/arch/m68k/include/asm/dma.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "dma_no.h" +#else +#include "dma_mm.h" +#endif diff --git a/trunk/include/asm-m68k/dma.h b/trunk/arch/m68k/include/asm/dma_mm.h similarity index 100% rename from trunk/include/asm-m68k/dma.h rename to trunk/arch/m68k/include/asm/dma_mm.h diff --git a/trunk/arch/m68knommu/include/asm/dma.h b/trunk/arch/m68k/include/asm/dma_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/dma.h rename to trunk/arch/m68k/include/asm/dma_no.h diff --git a/trunk/include/asm-m68k/dsp56k.h b/trunk/arch/m68k/include/asm/dsp56k.h similarity index 100% rename from trunk/include/asm-m68k/dsp56k.h rename to trunk/arch/m68k/include/asm/dsp56k.h diff --git a/trunk/include/asm-m68k/dvma.h b/trunk/arch/m68k/include/asm/dvma.h similarity index 100% rename from trunk/include/asm-m68k/dvma.h rename to trunk/arch/m68k/include/asm/dvma.h diff --git a/trunk/arch/m68k/include/asm/elf.h b/trunk/arch/m68k/include/asm/elf.h new file mode 100644 index 000000000000..04ce488bc63f --- /dev/null +++ b/trunk/arch/m68k/include/asm/elf.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "elf_no.h" +#else +#include "elf_mm.h" +#endif diff --git a/trunk/include/asm-m68k/elf.h b/trunk/arch/m68k/include/asm/elf_mm.h similarity index 100% rename from trunk/include/asm-m68k/elf.h rename to trunk/arch/m68k/include/asm/elf_mm.h diff --git a/trunk/arch/m68knommu/include/asm/elf.h b/trunk/arch/m68k/include/asm/elf_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/elf.h rename to trunk/arch/m68k/include/asm/elf_no.h diff --git a/trunk/arch/m68knommu/include/asm/elia.h b/trunk/arch/m68k/include/asm/elia.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/elia.h rename to trunk/arch/m68k/include/asm/elia.h diff --git a/trunk/arch/m68knommu/include/asm/emergency-restart.h b/trunk/arch/m68k/include/asm/emergency-restart.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/emergency-restart.h rename to trunk/arch/m68k/include/asm/emergency-restart.h diff --git a/trunk/arch/m68k/include/asm/entry.h b/trunk/arch/m68k/include/asm/entry.h new file mode 100644 index 000000000000..876eec6f2b52 --- /dev/null +++ b/trunk/arch/m68k/include/asm/entry.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "entry_no.h" +#else +#include "entry_mm.h" +#endif diff --git a/trunk/include/asm-m68k/entry.h b/trunk/arch/m68k/include/asm/entry_mm.h similarity index 100% rename from trunk/include/asm-m68k/entry.h rename to trunk/arch/m68k/include/asm/entry_mm.h diff --git a/trunk/arch/m68knommu/include/asm/entry.h b/trunk/arch/m68k/include/asm/entry_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/entry.h rename to trunk/arch/m68k/include/asm/entry_no.h diff --git a/trunk/include/asm-m68k/errno.h b/trunk/arch/m68k/include/asm/errno.h similarity index 100% rename from trunk/include/asm-m68k/errno.h rename to trunk/arch/m68k/include/asm/errno.h diff --git a/trunk/arch/m68k/include/asm/fb.h b/trunk/arch/m68k/include/asm/fb.h new file mode 100644 index 000000000000..97bcaefd2064 --- /dev/null +++ b/trunk/arch/m68k/include/asm/fb.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "fb_no.h" +#else +#include "fb_mm.h" +#endif diff --git a/trunk/include/asm-m68k/fb.h b/trunk/arch/m68k/include/asm/fb_mm.h similarity index 100% rename from trunk/include/asm-m68k/fb.h rename to trunk/arch/m68k/include/asm/fb_mm.h diff --git a/trunk/arch/m68knommu/include/asm/fb.h b/trunk/arch/m68k/include/asm/fb_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/fb.h rename to trunk/arch/m68k/include/asm/fb_no.h diff --git a/trunk/include/asm-m68k/fbio.h b/trunk/arch/m68k/include/asm/fbio.h similarity index 100% rename from trunk/include/asm-m68k/fbio.h rename to trunk/arch/m68k/include/asm/fbio.h diff --git a/trunk/include/asm-m68k/fcntl.h b/trunk/arch/m68k/include/asm/fcntl.h similarity index 100% rename from trunk/include/asm-m68k/fcntl.h rename to trunk/arch/m68k/include/asm/fcntl.h diff --git a/trunk/arch/m68knommu/include/asm/flat.h b/trunk/arch/m68k/include/asm/flat.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/flat.h rename to trunk/arch/m68k/include/asm/flat.h diff --git a/trunk/include/asm-m68k/floppy.h b/trunk/arch/m68k/include/asm/floppy.h similarity index 100% rename from trunk/include/asm-m68k/floppy.h rename to trunk/arch/m68k/include/asm/floppy.h diff --git a/trunk/arch/m68k/include/asm/fpu.h b/trunk/arch/m68k/include/asm/fpu.h new file mode 100644 index 000000000000..e19bc5ed9c37 --- /dev/null +++ b/trunk/arch/m68k/include/asm/fpu.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "fpu_no.h" +#else +#include "fpu_mm.h" +#endif diff --git a/trunk/include/asm-m68k/fpu.h b/trunk/arch/m68k/include/asm/fpu_mm.h similarity index 100% rename from trunk/include/asm-m68k/fpu.h rename to trunk/arch/m68k/include/asm/fpu_mm.h diff --git a/trunk/arch/m68knommu/include/asm/fpu.h b/trunk/arch/m68k/include/asm/fpu_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/fpu.h rename to trunk/arch/m68k/include/asm/fpu_no.h diff --git a/trunk/arch/m68knommu/include/asm/futex.h b/trunk/arch/m68k/include/asm/futex.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/futex.h rename to trunk/arch/m68k/include/asm/futex.h diff --git a/trunk/arch/m68k/include/asm/hardirq.h b/trunk/arch/m68k/include/asm/hardirq.h new file mode 100644 index 000000000000..56d0d5db231c --- /dev/null +++ b/trunk/arch/m68k/include/asm/hardirq.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "hardirq_no.h" +#else +#include "hardirq_mm.h" +#endif diff --git a/trunk/include/asm-m68k/hardirq.h b/trunk/arch/m68k/include/asm/hardirq_mm.h similarity index 100% rename from trunk/include/asm-m68k/hardirq.h rename to trunk/arch/m68k/include/asm/hardirq_mm.h diff --git a/trunk/arch/m68knommu/include/asm/hardirq.h b/trunk/arch/m68k/include/asm/hardirq_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/hardirq.h rename to trunk/arch/m68k/include/asm/hardirq_no.h diff --git a/trunk/include/asm-m68k/hp300hw.h b/trunk/arch/m68k/include/asm/hp300hw.h similarity index 100% rename from trunk/include/asm-m68k/hp300hw.h rename to trunk/arch/m68k/include/asm/hp300hw.h diff --git a/trunk/arch/m68k/include/asm/hw_irq.h b/trunk/arch/m68k/include/asm/hw_irq.h new file mode 100644 index 000000000000..e19526015890 --- /dev/null +++ b/trunk/arch/m68k/include/asm/hw_irq.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "hw_irq_no.h" +#else +#include "hw_irq_mm.h" +#endif diff --git a/trunk/include/asm-m68k/hw_irq.h b/trunk/arch/m68k/include/asm/hw_irq_mm.h similarity index 100% rename from trunk/include/asm-m68k/hw_irq.h rename to trunk/arch/m68k/include/asm/hw_irq_mm.h diff --git a/trunk/arch/m68knommu/include/asm/hw_irq.h b/trunk/arch/m68k/include/asm/hw_irq_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/hw_irq.h rename to trunk/arch/m68k/include/asm/hw_irq_no.h diff --git a/trunk/include/asm-m68k/hwtest.h b/trunk/arch/m68k/include/asm/hwtest.h similarity index 100% rename from trunk/include/asm-m68k/hwtest.h rename to trunk/arch/m68k/include/asm/hwtest.h diff --git a/trunk/include/asm-m68k/ide.h b/trunk/arch/m68k/include/asm/ide.h similarity index 100% rename from trunk/include/asm-m68k/ide.h rename to trunk/arch/m68k/include/asm/ide.h diff --git a/trunk/include/asm-m68k/idprom.h b/trunk/arch/m68k/include/asm/idprom.h similarity index 100% rename from trunk/include/asm-m68k/idprom.h rename to trunk/arch/m68k/include/asm/idprom.h diff --git a/trunk/include/asm-m68k/intersil.h b/trunk/arch/m68k/include/asm/intersil.h similarity index 100% rename from trunk/include/asm-m68k/intersil.h rename to trunk/arch/m68k/include/asm/intersil.h diff --git a/trunk/arch/m68k/include/asm/io.h b/trunk/arch/m68k/include/asm/io.h new file mode 100644 index 000000000000..c7210ba184ea --- /dev/null +++ b/trunk/arch/m68k/include/asm/io.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "io_no.h" +#else +#include "io_mm.h" +#endif diff --git a/trunk/include/asm-m68k/io.h b/trunk/arch/m68k/include/asm/io_mm.h similarity index 100% rename from trunk/include/asm-m68k/io.h rename to trunk/arch/m68k/include/asm/io_mm.h diff --git a/trunk/arch/m68knommu/include/asm/io.h b/trunk/arch/m68k/include/asm/io_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/io.h rename to trunk/arch/m68k/include/asm/io_no.h diff --git a/trunk/arch/m68knommu/include/asm/ioctl.h b/trunk/arch/m68k/include/asm/ioctl.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/ioctl.h rename to trunk/arch/m68k/include/asm/ioctl.h diff --git a/trunk/include/asm-m68k/ioctls.h b/trunk/arch/m68k/include/asm/ioctls.h similarity index 100% rename from trunk/include/asm-m68k/ioctls.h rename to trunk/arch/m68k/include/asm/ioctls.h diff --git a/trunk/include/asm-m68k/ipcbuf.h b/trunk/arch/m68k/include/asm/ipcbuf.h similarity index 100% rename from trunk/include/asm-m68k/ipcbuf.h rename to trunk/arch/m68k/include/asm/ipcbuf.h diff --git a/trunk/arch/m68k/include/asm/irq.h b/trunk/arch/m68k/include/asm/irq.h new file mode 100644 index 000000000000..d031416595b2 --- /dev/null +++ b/trunk/arch/m68k/include/asm/irq.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "irq_no.h" +#else +#include "irq_mm.h" +#endif diff --git a/trunk/include/asm-m68k/irq.h b/trunk/arch/m68k/include/asm/irq_mm.h similarity index 100% rename from trunk/include/asm-m68k/irq.h rename to trunk/arch/m68k/include/asm/irq_mm.h diff --git a/trunk/arch/m68knommu/include/asm/irq.h b/trunk/arch/m68k/include/asm/irq_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/irq.h rename to trunk/arch/m68k/include/asm/irq_no.h diff --git a/trunk/arch/m68knommu/include/asm/irq_regs.h b/trunk/arch/m68k/include/asm/irq_regs.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/irq_regs.h rename to trunk/arch/m68k/include/asm/irq_regs.h diff --git a/trunk/arch/m68knommu/include/asm/kdebug.h b/trunk/arch/m68k/include/asm/kdebug.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/kdebug.h rename to trunk/arch/m68k/include/asm/kdebug.h diff --git a/trunk/arch/m68k/include/asm/kmap_types.h b/trunk/arch/m68k/include/asm/kmap_types.h new file mode 100644 index 000000000000..045d9fd122a2 --- /dev/null +++ b/trunk/arch/m68k/include/asm/kmap_types.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "kmap_types_no.h" +#else +#include "kmap_types_mm.h" +#endif diff --git a/trunk/include/asm-m68k/kmap_types.h b/trunk/arch/m68k/include/asm/kmap_types_mm.h similarity index 100% rename from trunk/include/asm-m68k/kmap_types.h rename to trunk/arch/m68k/include/asm/kmap_types_mm.h diff --git a/trunk/arch/m68knommu/include/asm/kmap_types.h b/trunk/arch/m68k/include/asm/kmap_types_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/kmap_types.h rename to trunk/arch/m68k/include/asm/kmap_types_no.h diff --git a/trunk/include/asm-m68k/linkage.h b/trunk/arch/m68k/include/asm/linkage.h similarity index 100% rename from trunk/include/asm-m68k/linkage.h rename to trunk/arch/m68k/include/asm/linkage.h diff --git a/trunk/include/asm-m68k/local.h b/trunk/arch/m68k/include/asm/local.h similarity index 100% rename from trunk/include/asm-m68k/local.h rename to trunk/arch/m68k/include/asm/local.h diff --git a/trunk/arch/m68knommu/include/asm/m5206sim.h b/trunk/arch/m68k/include/asm/m5206sim.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m5206sim.h rename to trunk/arch/m68k/include/asm/m5206sim.h diff --git a/trunk/arch/m68knommu/include/asm/m520xsim.h b/trunk/arch/m68k/include/asm/m520xsim.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m520xsim.h rename to trunk/arch/m68k/include/asm/m520xsim.h diff --git a/trunk/arch/m68knommu/include/asm/m523xsim.h b/trunk/arch/m68k/include/asm/m523xsim.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m523xsim.h rename to trunk/arch/m68k/include/asm/m523xsim.h diff --git a/trunk/arch/m68knommu/include/asm/m5249sim.h b/trunk/arch/m68k/include/asm/m5249sim.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m5249sim.h rename to trunk/arch/m68k/include/asm/m5249sim.h diff --git a/trunk/arch/m68knommu/include/asm/m5272sim.h b/trunk/arch/m68k/include/asm/m5272sim.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m5272sim.h rename to trunk/arch/m68k/include/asm/m5272sim.h diff --git a/trunk/arch/m68knommu/include/asm/m527xsim.h b/trunk/arch/m68k/include/asm/m527xsim.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m527xsim.h rename to trunk/arch/m68k/include/asm/m527xsim.h diff --git a/trunk/arch/m68knommu/include/asm/m528xsim.h b/trunk/arch/m68k/include/asm/m528xsim.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m528xsim.h rename to trunk/arch/m68k/include/asm/m528xsim.h diff --git a/trunk/arch/m68knommu/include/asm/m5307sim.h b/trunk/arch/m68k/include/asm/m5307sim.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m5307sim.h rename to trunk/arch/m68k/include/asm/m5307sim.h diff --git a/trunk/arch/m68knommu/include/asm/m532xsim.h b/trunk/arch/m68k/include/asm/m532xsim.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m532xsim.h rename to trunk/arch/m68k/include/asm/m532xsim.h diff --git a/trunk/arch/m68knommu/include/asm/m5407sim.h b/trunk/arch/m68k/include/asm/m5407sim.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m5407sim.h rename to trunk/arch/m68k/include/asm/m5407sim.h diff --git a/trunk/arch/m68knommu/include/asm/m68360.h b/trunk/arch/m68k/include/asm/m68360.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m68360.h rename to trunk/arch/m68k/include/asm/m68360.h diff --git a/trunk/arch/m68knommu/include/asm/m68360_enet.h b/trunk/arch/m68k/include/asm/m68360_enet.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m68360_enet.h rename to trunk/arch/m68k/include/asm/m68360_enet.h diff --git a/trunk/arch/m68knommu/include/asm/m68360_pram.h b/trunk/arch/m68k/include/asm/m68360_pram.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m68360_pram.h rename to trunk/arch/m68k/include/asm/m68360_pram.h diff --git a/trunk/arch/m68knommu/include/asm/m68360_quicc.h b/trunk/arch/m68k/include/asm/m68360_quicc.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m68360_quicc.h rename to trunk/arch/m68k/include/asm/m68360_quicc.h diff --git a/trunk/arch/m68knommu/include/asm/m68360_regs.h b/trunk/arch/m68k/include/asm/m68360_regs.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/m68360_regs.h rename to trunk/arch/m68k/include/asm/m68360_regs.h diff --git a/trunk/include/asm-m68k/mac_asc.h b/trunk/arch/m68k/include/asm/mac_asc.h similarity index 100% rename from trunk/include/asm-m68k/mac_asc.h rename to trunk/arch/m68k/include/asm/mac_asc.h diff --git a/trunk/include/asm-m68k/mac_baboon.h b/trunk/arch/m68k/include/asm/mac_baboon.h similarity index 100% rename from trunk/include/asm-m68k/mac_baboon.h rename to trunk/arch/m68k/include/asm/mac_baboon.h diff --git a/trunk/include/asm-m68k/mac_iop.h b/trunk/arch/m68k/include/asm/mac_iop.h similarity index 100% rename from trunk/include/asm-m68k/mac_iop.h rename to trunk/arch/m68k/include/asm/mac_iop.h diff --git a/trunk/include/asm-m68k/mac_mouse.h b/trunk/arch/m68k/include/asm/mac_mouse.h similarity index 100% rename from trunk/include/asm-m68k/mac_mouse.h rename to trunk/arch/m68k/include/asm/mac_mouse.h diff --git a/trunk/include/asm-m68k/mac_oss.h b/trunk/arch/m68k/include/asm/mac_oss.h similarity index 100% rename from trunk/include/asm-m68k/mac_oss.h rename to trunk/arch/m68k/include/asm/mac_oss.h diff --git a/trunk/include/asm-m68k/mac_psc.h b/trunk/arch/m68k/include/asm/mac_psc.h similarity index 100% rename from trunk/include/asm-m68k/mac_psc.h rename to trunk/arch/m68k/include/asm/mac_psc.h diff --git a/trunk/include/asm-m68k/mac_via.h b/trunk/arch/m68k/include/asm/mac_via.h similarity index 100% rename from trunk/include/asm-m68k/mac_via.h rename to trunk/arch/m68k/include/asm/mac_via.h diff --git a/trunk/arch/m68k/include/asm/machdep.h b/trunk/arch/m68k/include/asm/machdep.h new file mode 100644 index 000000000000..fc24b6fc5508 --- /dev/null +++ b/trunk/arch/m68k/include/asm/machdep.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "machdep_no.h" +#else +#include "machdep_mm.h" +#endif diff --git a/trunk/include/asm-m68k/machdep.h b/trunk/arch/m68k/include/asm/machdep_mm.h similarity index 100% rename from trunk/include/asm-m68k/machdep.h rename to trunk/arch/m68k/include/asm/machdep_mm.h diff --git a/trunk/arch/m68knommu/include/asm/machdep.h b/trunk/arch/m68k/include/asm/machdep_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/machdep.h rename to trunk/arch/m68k/include/asm/machdep_no.h diff --git a/trunk/include/asm-m68k/machines.h b/trunk/arch/m68k/include/asm/machines.h similarity index 100% rename from trunk/include/asm-m68k/machines.h rename to trunk/arch/m68k/include/asm/machines.h diff --git a/trunk/include/asm-m68k/machw.h b/trunk/arch/m68k/include/asm/machw.h similarity index 100% rename from trunk/include/asm-m68k/machw.h rename to trunk/arch/m68k/include/asm/machw.h diff --git a/trunk/include/asm-m68k/macintosh.h b/trunk/arch/m68k/include/asm/macintosh.h similarity index 100% rename from trunk/include/asm-m68k/macintosh.h rename to trunk/arch/m68k/include/asm/macintosh.h diff --git a/trunk/include/asm-m68k/macints.h b/trunk/arch/m68k/include/asm/macints.h similarity index 100% rename from trunk/include/asm-m68k/macints.h rename to trunk/arch/m68k/include/asm/macints.h diff --git a/trunk/include/asm-m68k/math-emu.h b/trunk/arch/m68k/include/asm/math-emu.h similarity index 100% rename from trunk/include/asm-m68k/math-emu.h rename to trunk/arch/m68k/include/asm/math-emu.h diff --git a/trunk/arch/m68k/include/asm/mc146818rtc.h b/trunk/arch/m68k/include/asm/mc146818rtc.h new file mode 100644 index 000000000000..fb90dcf78426 --- /dev/null +++ b/trunk/arch/m68k/include/asm/mc146818rtc.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "mc146818rtc_no.h" +#else +#include "mc146818rtc_mm.h" +#endif diff --git a/trunk/include/asm-m68k/mc146818rtc.h b/trunk/arch/m68k/include/asm/mc146818rtc_mm.h similarity index 100% rename from trunk/include/asm-m68k/mc146818rtc.h rename to trunk/arch/m68k/include/asm/mc146818rtc_mm.h diff --git a/trunk/arch/m68knommu/include/asm/mc146818rtc.h b/trunk/arch/m68k/include/asm/mc146818rtc_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mc146818rtc.h rename to trunk/arch/m68k/include/asm/mc146818rtc_no.h diff --git a/trunk/arch/m68knommu/include/asm/mcfcache.h b/trunk/arch/m68k/include/asm/mcfcache.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mcfcache.h rename to trunk/arch/m68k/include/asm/mcfcache.h diff --git a/trunk/arch/m68knommu/include/asm/mcfdma.h b/trunk/arch/m68k/include/asm/mcfdma.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mcfdma.h rename to trunk/arch/m68k/include/asm/mcfdma.h diff --git a/trunk/arch/m68knommu/include/asm/mcfmbus.h b/trunk/arch/m68k/include/asm/mcfmbus.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mcfmbus.h rename to trunk/arch/m68k/include/asm/mcfmbus.h diff --git a/trunk/arch/m68knommu/include/asm/mcfne.h b/trunk/arch/m68k/include/asm/mcfne.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mcfne.h rename to trunk/arch/m68k/include/asm/mcfne.h diff --git a/trunk/arch/m68knommu/include/asm/mcfpci.h b/trunk/arch/m68k/include/asm/mcfpci.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mcfpci.h rename to trunk/arch/m68k/include/asm/mcfpci.h diff --git a/trunk/arch/m68knommu/include/asm/mcfpit.h b/trunk/arch/m68k/include/asm/mcfpit.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mcfpit.h rename to trunk/arch/m68k/include/asm/mcfpit.h diff --git a/trunk/arch/m68knommu/include/asm/mcfsim.h b/trunk/arch/m68k/include/asm/mcfsim.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mcfsim.h rename to trunk/arch/m68k/include/asm/mcfsim.h diff --git a/trunk/arch/m68knommu/include/asm/mcfsmc.h b/trunk/arch/m68k/include/asm/mcfsmc.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mcfsmc.h rename to trunk/arch/m68k/include/asm/mcfsmc.h diff --git a/trunk/arch/m68knommu/include/asm/mcftimer.h b/trunk/arch/m68k/include/asm/mcftimer.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mcftimer.h rename to trunk/arch/m68k/include/asm/mcftimer.h diff --git a/trunk/arch/m68knommu/include/asm/mcfuart.h b/trunk/arch/m68k/include/asm/mcfuart.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mcfuart.h rename to trunk/arch/m68k/include/asm/mcfuart.h diff --git a/trunk/arch/m68knommu/include/asm/mcfwdebug.h b/trunk/arch/m68k/include/asm/mcfwdebug.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mcfwdebug.h rename to trunk/arch/m68k/include/asm/mcfwdebug.h diff --git a/trunk/include/asm-m68k/md.h b/trunk/arch/m68k/include/asm/md.h similarity index 100% rename from trunk/include/asm-m68k/md.h rename to trunk/arch/m68k/include/asm/md.h diff --git a/trunk/include/asm-m68k/mman.h b/trunk/arch/m68k/include/asm/mman.h similarity index 100% rename from trunk/include/asm-m68k/mman.h rename to trunk/arch/m68k/include/asm/mman.h diff --git a/trunk/arch/m68k/include/asm/mmu.h b/trunk/arch/m68k/include/asm/mmu.h new file mode 100644 index 000000000000..a81d3946675f --- /dev/null +++ b/trunk/arch/m68k/include/asm/mmu.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "mmu_no.h" +#else +#include "mmu_mm.h" +#endif diff --git a/trunk/arch/m68k/include/asm/mmu_context.h b/trunk/arch/m68k/include/asm/mmu_context.h new file mode 100644 index 000000000000..b440928fc6c7 --- /dev/null +++ b/trunk/arch/m68k/include/asm/mmu_context.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "mmu_context_no.h" +#else +#include "mmu_context_mm.h" +#endif diff --git a/trunk/include/asm-m68k/mmu_context.h b/trunk/arch/m68k/include/asm/mmu_context_mm.h similarity index 100% rename from trunk/include/asm-m68k/mmu_context.h rename to trunk/arch/m68k/include/asm/mmu_context_mm.h diff --git a/trunk/arch/m68knommu/include/asm/mmu_context.h b/trunk/arch/m68k/include/asm/mmu_context_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mmu_context.h rename to trunk/arch/m68k/include/asm/mmu_context_no.h diff --git a/trunk/include/asm-m68k/mmu.h b/trunk/arch/m68k/include/asm/mmu_mm.h similarity index 100% rename from trunk/include/asm-m68k/mmu.h rename to trunk/arch/m68k/include/asm/mmu_mm.h diff --git a/trunk/arch/m68knommu/include/asm/mmu.h b/trunk/arch/m68k/include/asm/mmu_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mmu.h rename to trunk/arch/m68k/include/asm/mmu_no.h diff --git a/trunk/include/asm-m68k/mmzone.h b/trunk/arch/m68k/include/asm/mmzone.h similarity index 100% rename from trunk/include/asm-m68k/mmzone.h rename to trunk/arch/m68k/include/asm/mmzone.h diff --git a/trunk/arch/m68k/include/asm/module.h b/trunk/arch/m68k/include/asm/module.h new file mode 100644 index 000000000000..79b59d137dd0 --- /dev/null +++ b/trunk/arch/m68k/include/asm/module.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "module_no.h" +#else +#include "module_mm.h" +#endif diff --git a/trunk/include/asm-m68k/module.h b/trunk/arch/m68k/include/asm/module_mm.h similarity index 100% rename from trunk/include/asm-m68k/module.h rename to trunk/arch/m68k/include/asm/module_mm.h diff --git a/trunk/arch/m68knommu/include/asm/module.h b/trunk/arch/m68k/include/asm/module_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/module.h rename to trunk/arch/m68k/include/asm/module_no.h diff --git a/trunk/include/asm-m68k/motorola_pgalloc.h b/trunk/arch/m68k/include/asm/motorola_pgalloc.h similarity index 100% rename from trunk/include/asm-m68k/motorola_pgalloc.h rename to trunk/arch/m68k/include/asm/motorola_pgalloc.h diff --git a/trunk/include/asm-m68k/motorola_pgtable.h b/trunk/arch/m68k/include/asm/motorola_pgtable.h similarity index 100% rename from trunk/include/asm-m68k/motorola_pgtable.h rename to trunk/arch/m68k/include/asm/motorola_pgtable.h diff --git a/trunk/include/asm-m68k/movs.h b/trunk/arch/m68k/include/asm/movs.h similarity index 100% rename from trunk/include/asm-m68k/movs.h rename to trunk/arch/m68k/include/asm/movs.h diff --git a/trunk/include/asm-m68k/msgbuf.h b/trunk/arch/m68k/include/asm/msgbuf.h similarity index 100% rename from trunk/include/asm-m68k/msgbuf.h rename to trunk/arch/m68k/include/asm/msgbuf.h diff --git a/trunk/arch/m68knommu/include/asm/mutex.h b/trunk/arch/m68k/include/asm/mutex.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/mutex.h rename to trunk/arch/m68k/include/asm/mutex.h diff --git a/trunk/include/asm-m68k/mvme147hw.h b/trunk/arch/m68k/include/asm/mvme147hw.h similarity index 100% rename from trunk/include/asm-m68k/mvme147hw.h rename to trunk/arch/m68k/include/asm/mvme147hw.h diff --git a/trunk/include/asm-m68k/mvme16xhw.h b/trunk/arch/m68k/include/asm/mvme16xhw.h similarity index 100% rename from trunk/include/asm-m68k/mvme16xhw.h rename to trunk/arch/m68k/include/asm/mvme16xhw.h diff --git a/trunk/arch/m68knommu/include/asm/nettel.h b/trunk/arch/m68k/include/asm/nettel.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/nettel.h rename to trunk/arch/m68k/include/asm/nettel.h diff --git a/trunk/include/asm-m68k/nubus.h b/trunk/arch/m68k/include/asm/nubus.h similarity index 100% rename from trunk/include/asm-m68k/nubus.h rename to trunk/arch/m68k/include/asm/nubus.h diff --git a/trunk/include/asm-m68k/openprom.h b/trunk/arch/m68k/include/asm/openprom.h similarity index 100% rename from trunk/include/asm-m68k/openprom.h rename to trunk/arch/m68k/include/asm/openprom.h diff --git a/trunk/include/asm-m68k/oplib.h b/trunk/arch/m68k/include/asm/oplib.h similarity index 100% rename from trunk/include/asm-m68k/oplib.h rename to trunk/arch/m68k/include/asm/oplib.h diff --git a/trunk/arch/m68k/include/asm/page.h b/trunk/arch/m68k/include/asm/page.h new file mode 100644 index 000000000000..f2b4480cc98a --- /dev/null +++ b/trunk/arch/m68k/include/asm/page.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "page_no.h" +#else +#include "page_mm.h" +#endif diff --git a/trunk/include/asm-m68k/page.h b/trunk/arch/m68k/include/asm/page_mm.h similarity index 100% rename from trunk/include/asm-m68k/page.h rename to trunk/arch/m68k/include/asm/page_mm.h diff --git a/trunk/arch/m68knommu/include/asm/page.h b/trunk/arch/m68k/include/asm/page_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/page.h rename to trunk/arch/m68k/include/asm/page_no.h diff --git a/trunk/arch/m68k/include/asm/page_offset.h b/trunk/arch/m68k/include/asm/page_offset.h new file mode 100644 index 000000000000..66455c849fbb --- /dev/null +++ b/trunk/arch/m68k/include/asm/page_offset.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "page_offset_no.h" +#else +#include "page_offset_mm.h" +#endif diff --git a/trunk/include/asm-m68k/page_offset.h b/trunk/arch/m68k/include/asm/page_offset_mm.h similarity index 100% rename from trunk/include/asm-m68k/page_offset.h rename to trunk/arch/m68k/include/asm/page_offset_mm.h diff --git a/trunk/arch/m68knommu/include/asm/page_offset.h b/trunk/arch/m68k/include/asm/page_offset_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/page_offset.h rename to trunk/arch/m68k/include/asm/page_offset_no.h diff --git a/trunk/arch/m68k/include/asm/param.h b/trunk/arch/m68k/include/asm/param.h new file mode 100644 index 000000000000..40d1112a4588 --- /dev/null +++ b/trunk/arch/m68k/include/asm/param.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "param_no.h" +#else +#include "param_mm.h" +#endif diff --git a/trunk/include/asm-m68k/param.h b/trunk/arch/m68k/include/asm/param_mm.h similarity index 100% rename from trunk/include/asm-m68k/param.h rename to trunk/arch/m68k/include/asm/param_mm.h diff --git a/trunk/arch/m68knommu/include/asm/param.h b/trunk/arch/m68k/include/asm/param_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/param.h rename to trunk/arch/m68k/include/asm/param_no.h diff --git a/trunk/include/asm-m68k/parport.h b/trunk/arch/m68k/include/asm/parport.h similarity index 100% rename from trunk/include/asm-m68k/parport.h rename to trunk/arch/m68k/include/asm/parport.h diff --git a/trunk/arch/m68k/include/asm/pci.h b/trunk/arch/m68k/include/asm/pci.h new file mode 100644 index 000000000000..dbea95373080 --- /dev/null +++ b/trunk/arch/m68k/include/asm/pci.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "pci_no.h" +#else +#include "pci_mm.h" +#endif diff --git a/trunk/include/asm-m68k/pci.h b/trunk/arch/m68k/include/asm/pci_mm.h similarity index 100% rename from trunk/include/asm-m68k/pci.h rename to trunk/arch/m68k/include/asm/pci_mm.h diff --git a/trunk/arch/m68knommu/include/asm/pci.h b/trunk/arch/m68k/include/asm/pci_no.h similarity index 96% rename from trunk/arch/m68knommu/include/asm/pci.h rename to trunk/arch/m68k/include/asm/pci_no.h index a13f3cc87451..9abbc03c73ee 100644 --- a/trunk/arch/m68knommu/include/asm/pci.h +++ b/trunk/arch/m68k/include/asm/pci_no.h @@ -1,7 +1,7 @@ #ifndef M68KNOMMU_PCI_H #define M68KNOMMU_PCI_H -#include +#include #ifdef CONFIG_COMEMPCI /* diff --git a/trunk/include/asm-m68k/percpu.h b/trunk/arch/m68k/include/asm/percpu.h similarity index 100% rename from trunk/include/asm-m68k/percpu.h rename to trunk/arch/m68k/include/asm/percpu.h diff --git a/trunk/arch/m68k/include/asm/pgalloc.h b/trunk/arch/m68k/include/asm/pgalloc.h new file mode 100644 index 000000000000..059cb73e78fc --- /dev/null +++ b/trunk/arch/m68k/include/asm/pgalloc.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "pgalloc_no.h" +#else +#include "pgalloc_mm.h" +#endif diff --git a/trunk/include/asm-m68k/pgalloc.h b/trunk/arch/m68k/include/asm/pgalloc_mm.h similarity index 100% rename from trunk/include/asm-m68k/pgalloc.h rename to trunk/arch/m68k/include/asm/pgalloc_mm.h diff --git a/trunk/arch/m68knommu/include/asm/pgalloc.h b/trunk/arch/m68k/include/asm/pgalloc_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/pgalloc.h rename to trunk/arch/m68k/include/asm/pgalloc_no.h diff --git a/trunk/arch/m68k/include/asm/pgtable.h b/trunk/arch/m68k/include/asm/pgtable.h new file mode 100644 index 000000000000..ee6759eb445a --- /dev/null +++ b/trunk/arch/m68k/include/asm/pgtable.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "pgtable_no.h" +#else +#include "pgtable_mm.h" +#endif diff --git a/trunk/include/asm-m68k/pgtable.h b/trunk/arch/m68k/include/asm/pgtable_mm.h similarity index 100% rename from trunk/include/asm-m68k/pgtable.h rename to trunk/arch/m68k/include/asm/pgtable_mm.h diff --git a/trunk/arch/m68knommu/include/asm/pgtable.h b/trunk/arch/m68k/include/asm/pgtable_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/pgtable.h rename to trunk/arch/m68k/include/asm/pgtable_no.h diff --git a/trunk/include/asm-m68k/poll.h b/trunk/arch/m68k/include/asm/poll.h similarity index 100% rename from trunk/include/asm-m68k/poll.h rename to trunk/arch/m68k/include/asm/poll.h diff --git a/trunk/include/asm-m68k/posix_types.h b/trunk/arch/m68k/include/asm/posix_types.h similarity index 100% rename from trunk/include/asm-m68k/posix_types.h rename to trunk/arch/m68k/include/asm/posix_types.h diff --git a/trunk/arch/m68k/include/asm/processor.h b/trunk/arch/m68k/include/asm/processor.h new file mode 100644 index 000000000000..fc3f2c22f2b8 --- /dev/null +++ b/trunk/arch/m68k/include/asm/processor.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "processor_no.h" +#else +#include "processor_mm.h" +#endif diff --git a/trunk/include/asm-m68k/processor.h b/trunk/arch/m68k/include/asm/processor_mm.h similarity index 100% rename from trunk/include/asm-m68k/processor.h rename to trunk/arch/m68k/include/asm/processor_mm.h diff --git a/trunk/arch/m68knommu/include/asm/processor.h b/trunk/arch/m68k/include/asm/processor_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/processor.h rename to trunk/arch/m68k/include/asm/processor_no.h diff --git a/trunk/arch/m68k/include/asm/ptrace.h b/trunk/arch/m68k/include/asm/ptrace.h new file mode 100644 index 000000000000..e83cd2f66101 --- /dev/null +++ b/trunk/arch/m68k/include/asm/ptrace.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "ptrace_no.h" +#else +#include "ptrace_mm.h" +#endif diff --git a/trunk/include/asm-m68k/ptrace.h b/trunk/arch/m68k/include/asm/ptrace_mm.h similarity index 100% rename from trunk/include/asm-m68k/ptrace.h rename to trunk/arch/m68k/include/asm/ptrace_mm.h diff --git a/trunk/arch/m68knommu/include/asm/ptrace.h b/trunk/arch/m68k/include/asm/ptrace_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/ptrace.h rename to trunk/arch/m68k/include/asm/ptrace_no.h diff --git a/trunk/include/asm-m68k/q40_master.h b/trunk/arch/m68k/include/asm/q40_master.h similarity index 100% rename from trunk/include/asm-m68k/q40_master.h rename to trunk/arch/m68k/include/asm/q40_master.h diff --git a/trunk/include/asm-m68k/q40ints.h b/trunk/arch/m68k/include/asm/q40ints.h similarity index 100% rename from trunk/include/asm-m68k/q40ints.h rename to trunk/arch/m68k/include/asm/q40ints.h diff --git a/trunk/arch/m68knommu/include/asm/quicc_simple.h b/trunk/arch/m68k/include/asm/quicc_simple.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/quicc_simple.h rename to trunk/arch/m68k/include/asm/quicc_simple.h diff --git a/trunk/include/asm-m68k/raw_io.h b/trunk/arch/m68k/include/asm/raw_io.h similarity index 100% rename from trunk/include/asm-m68k/raw_io.h rename to trunk/arch/m68k/include/asm/raw_io.h diff --git a/trunk/include/asm-m68k/resource.h b/trunk/arch/m68k/include/asm/resource.h similarity index 100% rename from trunk/include/asm-m68k/resource.h rename to trunk/arch/m68k/include/asm/resource.h diff --git a/trunk/include/asm-m68k/rtc.h b/trunk/arch/m68k/include/asm/rtc.h similarity index 100% rename from trunk/include/asm-m68k/rtc.h rename to trunk/arch/m68k/include/asm/rtc.h diff --git a/trunk/include/asm-m68k/sbus.h b/trunk/arch/m68k/include/asm/sbus.h similarity index 100% rename from trunk/include/asm-m68k/sbus.h rename to trunk/arch/m68k/include/asm/sbus.h diff --git a/trunk/arch/m68k/include/asm/scatterlist.h b/trunk/arch/m68k/include/asm/scatterlist.h new file mode 100644 index 000000000000..b7e528636252 --- /dev/null +++ b/trunk/arch/m68k/include/asm/scatterlist.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "scatterlist_no.h" +#else +#include "scatterlist_mm.h" +#endif diff --git a/trunk/include/asm-m68k/scatterlist.h b/trunk/arch/m68k/include/asm/scatterlist_mm.h similarity index 100% rename from trunk/include/asm-m68k/scatterlist.h rename to trunk/arch/m68k/include/asm/scatterlist_mm.h diff --git a/trunk/arch/m68knommu/include/asm/scatterlist.h b/trunk/arch/m68k/include/asm/scatterlist_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/scatterlist.h rename to trunk/arch/m68k/include/asm/scatterlist_no.h diff --git a/trunk/include/asm-m68k/sections.h b/trunk/arch/m68k/include/asm/sections.h similarity index 100% rename from trunk/include/asm-m68k/sections.h rename to trunk/arch/m68k/include/asm/sections.h diff --git a/trunk/arch/m68k/include/asm/segment.h b/trunk/arch/m68k/include/asm/segment.h new file mode 100644 index 000000000000..82583bc004bd --- /dev/null +++ b/trunk/arch/m68k/include/asm/segment.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "segment_no.h" +#else +#include "segment_mm.h" +#endif diff --git a/trunk/include/asm-m68k/segment.h b/trunk/arch/m68k/include/asm/segment_mm.h similarity index 100% rename from trunk/include/asm-m68k/segment.h rename to trunk/arch/m68k/include/asm/segment_mm.h diff --git a/trunk/arch/m68knommu/include/asm/segment.h b/trunk/arch/m68k/include/asm/segment_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/segment.h rename to trunk/arch/m68k/include/asm/segment_no.h diff --git a/trunk/include/asm-m68k/sembuf.h b/trunk/arch/m68k/include/asm/sembuf.h similarity index 100% rename from trunk/include/asm-m68k/sembuf.h rename to trunk/arch/m68k/include/asm/sembuf.h diff --git a/trunk/include/asm-m68k/serial.h b/trunk/arch/m68k/include/asm/serial.h similarity index 100% rename from trunk/include/asm-m68k/serial.h rename to trunk/arch/m68k/include/asm/serial.h diff --git a/trunk/arch/m68k/include/asm/setup.h b/trunk/arch/m68k/include/asm/setup.h new file mode 100644 index 000000000000..842f86f75ccd --- /dev/null +++ b/trunk/arch/m68k/include/asm/setup.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "setup_no.h" +#else +#include "setup_mm.h" +#endif diff --git a/trunk/include/asm-m68k/setup.h b/trunk/arch/m68k/include/asm/setup_mm.h similarity index 100% rename from trunk/include/asm-m68k/setup.h rename to trunk/arch/m68k/include/asm/setup_mm.h diff --git a/trunk/arch/m68knommu/include/asm/setup.h b/trunk/arch/m68k/include/asm/setup_no.h similarity index 84% rename from trunk/arch/m68knommu/include/asm/setup.h rename to trunk/arch/m68k/include/asm/setup_no.h index fb86bb2a6078..45d286ce9398 100644 --- a/trunk/arch/m68knommu/include/asm/setup.h +++ b/trunk/arch/m68k/include/asm/setup_no.h @@ -1,6 +1,6 @@ #ifdef __KERNEL__ -#include +#include /* We have a bigger command line buffer. */ #undef COMMAND_LINE_SIZE diff --git a/trunk/include/asm-m68k/shm.h b/trunk/arch/m68k/include/asm/shm.h similarity index 100% rename from trunk/include/asm-m68k/shm.h rename to trunk/arch/m68k/include/asm/shm.h diff --git a/trunk/include/asm-m68k/shmbuf.h b/trunk/arch/m68k/include/asm/shmbuf.h similarity index 100% rename from trunk/include/asm-m68k/shmbuf.h rename to trunk/arch/m68k/include/asm/shmbuf.h diff --git a/trunk/include/asm-m68k/shmparam.h b/trunk/arch/m68k/include/asm/shmparam.h similarity index 100% rename from trunk/include/asm-m68k/shmparam.h rename to trunk/arch/m68k/include/asm/shmparam.h diff --git a/trunk/arch/m68k/include/asm/sigcontext.h b/trunk/arch/m68k/include/asm/sigcontext.h new file mode 100644 index 000000000000..bff6d40345a9 --- /dev/null +++ b/trunk/arch/m68k/include/asm/sigcontext.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "sigcontext_no.h" +#else +#include "sigcontext_mm.h" +#endif diff --git a/trunk/include/asm-m68k/sigcontext.h b/trunk/arch/m68k/include/asm/sigcontext_mm.h similarity index 100% rename from trunk/include/asm-m68k/sigcontext.h rename to trunk/arch/m68k/include/asm/sigcontext_mm.h diff --git a/trunk/arch/m68knommu/include/asm/sigcontext.h b/trunk/arch/m68k/include/asm/sigcontext_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/sigcontext.h rename to trunk/arch/m68k/include/asm/sigcontext_no.h diff --git a/trunk/arch/m68k/include/asm/siginfo.h b/trunk/arch/m68k/include/asm/siginfo.h new file mode 100644 index 000000000000..61219d7affc8 --- /dev/null +++ b/trunk/arch/m68k/include/asm/siginfo.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "siginfo_no.h" +#else +#include "siginfo_mm.h" +#endif diff --git a/trunk/include/asm-m68k/siginfo.h b/trunk/arch/m68k/include/asm/siginfo_mm.h similarity index 100% rename from trunk/include/asm-m68k/siginfo.h rename to trunk/arch/m68k/include/asm/siginfo_mm.h diff --git a/trunk/arch/m68knommu/include/asm/siginfo.h b/trunk/arch/m68k/include/asm/siginfo_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/siginfo.h rename to trunk/arch/m68k/include/asm/siginfo_no.h diff --git a/trunk/arch/m68k/include/asm/signal.h b/trunk/arch/m68k/include/asm/signal.h new file mode 100644 index 000000000000..3c19988bd93c --- /dev/null +++ b/trunk/arch/m68k/include/asm/signal.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "signal_no.h" +#else +#include "signal_mm.h" +#endif diff --git a/trunk/include/asm-m68k/signal.h b/trunk/arch/m68k/include/asm/signal_mm.h similarity index 100% rename from trunk/include/asm-m68k/signal.h rename to trunk/arch/m68k/include/asm/signal_mm.h diff --git a/trunk/arch/m68knommu/include/asm/signal.h b/trunk/arch/m68k/include/asm/signal_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/signal.h rename to trunk/arch/m68k/include/asm/signal_no.h diff --git a/trunk/arch/m68knommu/include/asm/smp.h b/trunk/arch/m68k/include/asm/smp.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/smp.h rename to trunk/arch/m68k/include/asm/smp.h diff --git a/trunk/include/asm-m68k/socket.h b/trunk/arch/m68k/include/asm/socket.h similarity index 100% rename from trunk/include/asm-m68k/socket.h rename to trunk/arch/m68k/include/asm/socket.h diff --git a/trunk/include/asm-m68k/sockios.h b/trunk/arch/m68k/include/asm/sockios.h similarity index 100% rename from trunk/include/asm-m68k/sockios.h rename to trunk/arch/m68k/include/asm/sockios.h diff --git a/trunk/include/asm-m68k/spinlock.h b/trunk/arch/m68k/include/asm/spinlock.h similarity index 100% rename from trunk/include/asm-m68k/spinlock.h rename to trunk/arch/m68k/include/asm/spinlock.h diff --git a/trunk/include/asm-m68k/stat.h b/trunk/arch/m68k/include/asm/stat.h similarity index 100% rename from trunk/include/asm-m68k/stat.h rename to trunk/arch/m68k/include/asm/stat.h diff --git a/trunk/include/asm-m68k/statfs.h b/trunk/arch/m68k/include/asm/statfs.h similarity index 100% rename from trunk/include/asm-m68k/statfs.h rename to trunk/arch/m68k/include/asm/statfs.h diff --git a/trunk/arch/m68k/include/asm/string.h b/trunk/arch/m68k/include/asm/string.h new file mode 100644 index 000000000000..2c356f90f171 --- /dev/null +++ b/trunk/arch/m68k/include/asm/string.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "string_no.h" +#else +#include "string_mm.h" +#endif diff --git a/trunk/include/asm-m68k/string.h b/trunk/arch/m68k/include/asm/string_mm.h similarity index 100% rename from trunk/include/asm-m68k/string.h rename to trunk/arch/m68k/include/asm/string_mm.h diff --git a/trunk/arch/m68knommu/include/asm/string.h b/trunk/arch/m68k/include/asm/string_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/string.h rename to trunk/arch/m68k/include/asm/string_no.h diff --git a/trunk/include/asm-m68k/sun3-head.h b/trunk/arch/m68k/include/asm/sun3-head.h similarity index 100% rename from trunk/include/asm-m68k/sun3-head.h rename to trunk/arch/m68k/include/asm/sun3-head.h diff --git a/trunk/include/asm-m68k/sun3_pgalloc.h b/trunk/arch/m68k/include/asm/sun3_pgalloc.h similarity index 100% rename from trunk/include/asm-m68k/sun3_pgalloc.h rename to trunk/arch/m68k/include/asm/sun3_pgalloc.h diff --git a/trunk/include/asm-m68k/sun3_pgtable.h b/trunk/arch/m68k/include/asm/sun3_pgtable.h similarity index 100% rename from trunk/include/asm-m68k/sun3_pgtable.h rename to trunk/arch/m68k/include/asm/sun3_pgtable.h diff --git a/trunk/include/asm-m68k/sun3ints.h b/trunk/arch/m68k/include/asm/sun3ints.h similarity index 100% rename from trunk/include/asm-m68k/sun3ints.h rename to trunk/arch/m68k/include/asm/sun3ints.h diff --git a/trunk/include/asm-m68k/sun3mmu.h b/trunk/arch/m68k/include/asm/sun3mmu.h similarity index 100% rename from trunk/include/asm-m68k/sun3mmu.h rename to trunk/arch/m68k/include/asm/sun3mmu.h diff --git a/trunk/include/asm-m68k/sun3x.h b/trunk/arch/m68k/include/asm/sun3x.h similarity index 100% rename from trunk/include/asm-m68k/sun3x.h rename to trunk/arch/m68k/include/asm/sun3x.h diff --git a/trunk/include/asm-m68k/sun3xflop.h b/trunk/arch/m68k/include/asm/sun3xflop.h similarity index 100% rename from trunk/include/asm-m68k/sun3xflop.h rename to trunk/arch/m68k/include/asm/sun3xflop.h diff --git a/trunk/include/asm-m68k/sun3xprom.h b/trunk/arch/m68k/include/asm/sun3xprom.h similarity index 100% rename from trunk/include/asm-m68k/sun3xprom.h rename to trunk/arch/m68k/include/asm/sun3xprom.h diff --git a/trunk/include/asm-m68k/suspend.h b/trunk/arch/m68k/include/asm/suspend.h similarity index 100% rename from trunk/include/asm-m68k/suspend.h rename to trunk/arch/m68k/include/asm/suspend.h diff --git a/trunk/arch/m68k/include/asm/swab.h b/trunk/arch/m68k/include/asm/swab.h new file mode 100644 index 000000000000..7d7dde1c73ec --- /dev/null +++ b/trunk/arch/m68k/include/asm/swab.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "swab_no.h" +#else +#include "swab_mm.h" +#endif diff --git a/trunk/include/asm-m68k/swab.h b/trunk/arch/m68k/include/asm/swab_mm.h similarity index 100% rename from trunk/include/asm-m68k/swab.h rename to trunk/arch/m68k/include/asm/swab_mm.h diff --git a/trunk/arch/m68knommu/include/asm/swab.h b/trunk/arch/m68k/include/asm/swab_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/swab.h rename to trunk/arch/m68k/include/asm/swab_no.h diff --git a/trunk/arch/m68k/include/asm/system.h b/trunk/arch/m68k/include/asm/system.h new file mode 100644 index 000000000000..ccea925ff4f5 --- /dev/null +++ b/trunk/arch/m68k/include/asm/system.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "system_no.h" +#else +#include "system_mm.h" +#endif diff --git a/trunk/include/asm-m68k/system.h b/trunk/arch/m68k/include/asm/system_mm.h similarity index 100% rename from trunk/include/asm-m68k/system.h rename to trunk/arch/m68k/include/asm/system_mm.h diff --git a/trunk/arch/m68knommu/include/asm/system.h b/trunk/arch/m68k/include/asm/system_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/system.h rename to trunk/arch/m68k/include/asm/system_no.h diff --git a/trunk/include/asm-m68k/termbits.h b/trunk/arch/m68k/include/asm/termbits.h similarity index 100% rename from trunk/include/asm-m68k/termbits.h rename to trunk/arch/m68k/include/asm/termbits.h diff --git a/trunk/include/asm-m68k/termios.h b/trunk/arch/m68k/include/asm/termios.h similarity index 100% rename from trunk/include/asm-m68k/termios.h rename to trunk/arch/m68k/include/asm/termios.h diff --git a/trunk/arch/m68k/include/asm/thread_info.h b/trunk/arch/m68k/include/asm/thread_info.h new file mode 100644 index 000000000000..f31a3f42b7b3 --- /dev/null +++ b/trunk/arch/m68k/include/asm/thread_info.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "thread_info_no.h" +#else +#include "thread_info_mm.h" +#endif diff --git a/trunk/include/asm-m68k/thread_info.h b/trunk/arch/m68k/include/asm/thread_info_mm.h similarity index 100% rename from trunk/include/asm-m68k/thread_info.h rename to trunk/arch/m68k/include/asm/thread_info_mm.h diff --git a/trunk/arch/m68knommu/include/asm/thread_info.h b/trunk/arch/m68k/include/asm/thread_info_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/thread_info.h rename to trunk/arch/m68k/include/asm/thread_info_no.h diff --git a/trunk/arch/m68k/include/asm/timex.h b/trunk/arch/m68k/include/asm/timex.h new file mode 100644 index 000000000000..719762980578 --- /dev/null +++ b/trunk/arch/m68k/include/asm/timex.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "timex_no.h" +#else +#include "timex_mm.h" +#endif diff --git a/trunk/include/asm-m68k/timex.h b/trunk/arch/m68k/include/asm/timex_mm.h similarity index 100% rename from trunk/include/asm-m68k/timex.h rename to trunk/arch/m68k/include/asm/timex_mm.h diff --git a/trunk/arch/m68knommu/include/asm/timex.h b/trunk/arch/m68k/include/asm/timex_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/timex.h rename to trunk/arch/m68k/include/asm/timex_no.h diff --git a/trunk/include/asm-m68k/tlb.h b/trunk/arch/m68k/include/asm/tlb.h similarity index 100% rename from trunk/include/asm-m68k/tlb.h rename to trunk/arch/m68k/include/asm/tlb.h diff --git a/trunk/arch/m68k/include/asm/tlbflush.h b/trunk/arch/m68k/include/asm/tlbflush.h new file mode 100644 index 000000000000..b6f93b30951e --- /dev/null +++ b/trunk/arch/m68k/include/asm/tlbflush.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "tlbflush_no.h" +#else +#include "tlbflush_mm.h" +#endif diff --git a/trunk/include/asm-m68k/tlbflush.h b/trunk/arch/m68k/include/asm/tlbflush_mm.h similarity index 100% rename from trunk/include/asm-m68k/tlbflush.h rename to trunk/arch/m68k/include/asm/tlbflush_mm.h diff --git a/trunk/arch/m68knommu/include/asm/tlbflush.h b/trunk/arch/m68k/include/asm/tlbflush_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/tlbflush.h rename to trunk/arch/m68k/include/asm/tlbflush_no.h diff --git a/trunk/arch/m68knommu/include/asm/topology.h b/trunk/arch/m68k/include/asm/topology.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/topology.h rename to trunk/arch/m68k/include/asm/topology.h diff --git a/trunk/arch/m68k/include/asm/traps.h b/trunk/arch/m68k/include/asm/traps.h new file mode 100644 index 000000000000..3011ec0f5365 --- /dev/null +++ b/trunk/arch/m68k/include/asm/traps.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "traps_no.h" +#else +#include "traps_mm.h" +#endif diff --git a/trunk/include/asm-m68k/traps.h b/trunk/arch/m68k/include/asm/traps_mm.h similarity index 100% rename from trunk/include/asm-m68k/traps.h rename to trunk/arch/m68k/include/asm/traps_mm.h diff --git a/trunk/arch/m68knommu/include/asm/traps.h b/trunk/arch/m68k/include/asm/traps_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/traps.h rename to trunk/arch/m68k/include/asm/traps_no.h diff --git a/trunk/include/asm-m68k/types.h b/trunk/arch/m68k/include/asm/types.h similarity index 100% rename from trunk/include/asm-m68k/types.h rename to trunk/arch/m68k/include/asm/types.h diff --git a/trunk/arch/m68k/include/asm/uaccess.h b/trunk/arch/m68k/include/asm/uaccess.h new file mode 100644 index 000000000000..38f92dbb9a45 --- /dev/null +++ b/trunk/arch/m68k/include/asm/uaccess.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "uaccess_no.h" +#else +#include "uaccess_mm.h" +#endif diff --git a/trunk/include/asm-m68k/uaccess.h b/trunk/arch/m68k/include/asm/uaccess_mm.h similarity index 100% rename from trunk/include/asm-m68k/uaccess.h rename to trunk/arch/m68k/include/asm/uaccess_mm.h diff --git a/trunk/arch/m68knommu/include/asm/uaccess.h b/trunk/arch/m68k/include/asm/uaccess_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/uaccess.h rename to trunk/arch/m68k/include/asm/uaccess_no.h diff --git a/trunk/arch/m68k/include/asm/ucontext.h b/trunk/arch/m68k/include/asm/ucontext.h new file mode 100644 index 000000000000..b53cd160c0b3 --- /dev/null +++ b/trunk/arch/m68k/include/asm/ucontext.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "ucontext_no.h" +#else +#include "ucontext_mm.h" +#endif diff --git a/trunk/include/asm-m68k/ucontext.h b/trunk/arch/m68k/include/asm/ucontext_mm.h similarity index 100% rename from trunk/include/asm-m68k/ucontext.h rename to trunk/arch/m68k/include/asm/ucontext_mm.h diff --git a/trunk/arch/m68knommu/include/asm/ucontext.h b/trunk/arch/m68k/include/asm/ucontext_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/ucontext.h rename to trunk/arch/m68k/include/asm/ucontext_no.h diff --git a/trunk/arch/m68k/include/asm/unaligned.h b/trunk/arch/m68k/include/asm/unaligned.h new file mode 100644 index 000000000000..c640bba3bdf4 --- /dev/null +++ b/trunk/arch/m68k/include/asm/unaligned.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "unaligned_no.h" +#else +#include "unaligned_mm.h" +#endif diff --git a/trunk/include/asm-m68k/unaligned.h b/trunk/arch/m68k/include/asm/unaligned_mm.h similarity index 100% rename from trunk/include/asm-m68k/unaligned.h rename to trunk/arch/m68k/include/asm/unaligned_mm.h diff --git a/trunk/arch/m68knommu/include/asm/unaligned.h b/trunk/arch/m68k/include/asm/unaligned_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/unaligned.h rename to trunk/arch/m68k/include/asm/unaligned_no.h diff --git a/trunk/arch/m68k/include/asm/unistd.h b/trunk/arch/m68k/include/asm/unistd.h new file mode 100644 index 000000000000..df1d9d4cb1fd --- /dev/null +++ b/trunk/arch/m68k/include/asm/unistd.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "unistd_no.h" +#else +#include "unistd_mm.h" +#endif diff --git a/trunk/include/asm-m68k/unistd.h b/trunk/arch/m68k/include/asm/unistd_mm.h similarity index 100% rename from trunk/include/asm-m68k/unistd.h rename to trunk/arch/m68k/include/asm/unistd_mm.h diff --git a/trunk/arch/m68knommu/include/asm/unistd.h b/trunk/arch/m68k/include/asm/unistd_no.h similarity index 100% rename from trunk/arch/m68knommu/include/asm/unistd.h rename to trunk/arch/m68k/include/asm/unistd_no.h diff --git a/trunk/include/asm-m68k/user.h b/trunk/arch/m68k/include/asm/user.h similarity index 100% rename from trunk/include/asm-m68k/user.h rename to trunk/arch/m68k/include/asm/user.h diff --git a/trunk/include/asm-m68k/virtconvert.h b/trunk/arch/m68k/include/asm/virtconvert.h similarity index 100% rename from trunk/include/asm-m68k/virtconvert.h rename to trunk/arch/m68k/include/asm/virtconvert.h diff --git a/trunk/include/asm-m68k/xor.h b/trunk/arch/m68k/include/asm/xor.h similarity index 100% rename from trunk/include/asm-m68k/xor.h rename to trunk/arch/m68k/include/asm/xor.h diff --git a/trunk/include/asm-m68k/zorro.h b/trunk/arch/m68k/include/asm/zorro.h similarity index 100% rename from trunk/include/asm-m68k/zorro.h rename to trunk/arch/m68k/include/asm/zorro.h diff --git a/trunk/arch/m68knommu/include/asm/Kbuild b/trunk/arch/m68knommu/include/asm/Kbuild deleted file mode 100644 index c68e1680da01..000000000000 --- a/trunk/arch/m68knommu/include/asm/Kbuild +++ /dev/null @@ -1 +0,0 @@ -include include/asm-generic/Kbuild.asm diff --git a/trunk/arch/m68knommu/include/asm/byteorder.h b/trunk/arch/m68knommu/include/asm/byteorder.h deleted file mode 100644 index 9c6c76a15041..000000000000 --- a/trunk/arch/m68knommu/include/asm/byteorder.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _M68KNOMMU_BYTEORDER_H -#define _M68KNOMMU_BYTEORDER_H - -#include - -#endif /* _M68KNOMMU_BYTEORDER_H */ diff --git a/trunk/arch/m68knommu/include/asm/cachectl.h b/trunk/arch/m68knommu/include/asm/cachectl.h deleted file mode 100644 index bcf5a6a9dd52..000000000000 --- a/trunk/arch/m68knommu/include/asm/cachectl.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/cputime.h b/trunk/arch/m68knommu/include/asm/cputime.h deleted file mode 100644 index a0c4a660878d..000000000000 --- a/trunk/arch/m68knommu/include/asm/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __M68KNOMMU_CPUTIME_H -#define __M68KNOMMU_CPUTIME_H - -#include - -#endif /* __M68KNOMMU_CPUTIME_H */ diff --git a/trunk/arch/m68knommu/include/asm/errno.h b/trunk/arch/m68knommu/include/asm/errno.h deleted file mode 100644 index 7e8c22b9a5e6..000000000000 --- a/trunk/arch/m68knommu/include/asm/errno.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/fcntl.h b/trunk/arch/m68knommu/include/asm/fcntl.h deleted file mode 100644 index f6a552cda4cd..000000000000 --- a/trunk/arch/m68knommu/include/asm/fcntl.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/hwtest.h b/trunk/arch/m68knommu/include/asm/hwtest.h deleted file mode 100644 index 700626a1b1bf..000000000000 --- a/trunk/arch/m68knommu/include/asm/hwtest.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/ioctls.h b/trunk/arch/m68knommu/include/asm/ioctls.h deleted file mode 100644 index 0b1eb4d85059..000000000000 --- a/trunk/arch/m68knommu/include/asm/ioctls.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/ipcbuf.h b/trunk/arch/m68knommu/include/asm/ipcbuf.h deleted file mode 100644 index e4a7be6dd706..000000000000 --- a/trunk/arch/m68knommu/include/asm/ipcbuf.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/linkage.h b/trunk/arch/m68knommu/include/asm/linkage.h deleted file mode 100644 index c288a19ff489..000000000000 --- a/trunk/arch/m68knommu/include/asm/linkage.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/local.h b/trunk/arch/m68knommu/include/asm/local.h deleted file mode 100644 index 84a39c1b86f8..000000000000 --- a/trunk/arch/m68knommu/include/asm/local.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __M68KNOMMU_LOCAL_H -#define __M68KNOMMU_LOCAL_H - -#include - -#endif /* __M68KNOMMU_LOCAL_H */ diff --git a/trunk/arch/m68knommu/include/asm/math-emu.h b/trunk/arch/m68knommu/include/asm/math-emu.h deleted file mode 100644 index 7e7090517b72..000000000000 --- a/trunk/arch/m68knommu/include/asm/math-emu.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/md.h b/trunk/arch/m68knommu/include/asm/md.h deleted file mode 100644 index d810c78de5ff..000000000000 --- a/trunk/arch/m68knommu/include/asm/md.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/mman.h b/trunk/arch/m68knommu/include/asm/mman.h deleted file mode 100644 index 4846c682efed..000000000000 --- a/trunk/arch/m68knommu/include/asm/mman.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/movs.h b/trunk/arch/m68knommu/include/asm/movs.h deleted file mode 100644 index 81a16779e833..000000000000 --- a/trunk/arch/m68knommu/include/asm/movs.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/msgbuf.h b/trunk/arch/m68knommu/include/asm/msgbuf.h deleted file mode 100644 index bdfadec4d52d..000000000000 --- a/trunk/arch/m68knommu/include/asm/msgbuf.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/openprom.h b/trunk/arch/m68knommu/include/asm/openprom.h deleted file mode 100644 index fdba7953ff9f..000000000000 --- a/trunk/arch/m68knommu/include/asm/openprom.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/oplib.h b/trunk/arch/m68knommu/include/asm/oplib.h deleted file mode 100644 index ce079dc332d9..000000000000 --- a/trunk/arch/m68knommu/include/asm/oplib.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/percpu.h b/trunk/arch/m68knommu/include/asm/percpu.h deleted file mode 100644 index 5de72c327efd..000000000000 --- a/trunk/arch/m68knommu/include/asm/percpu.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ARCH_M68KNOMMU_PERCPU__ -#define __ARCH_M68KNOMMU_PERCPU__ - -#include - -#endif /* __ARCH_M68KNOMMU_PERCPU__ */ diff --git a/trunk/arch/m68knommu/include/asm/poll.h b/trunk/arch/m68knommu/include/asm/poll.h deleted file mode 100644 index ee1b6cb549ca..000000000000 --- a/trunk/arch/m68knommu/include/asm/poll.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/posix_types.h b/trunk/arch/m68knommu/include/asm/posix_types.h deleted file mode 100644 index 6205fb9392a3..000000000000 --- a/trunk/arch/m68knommu/include/asm/posix_types.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/resource.h b/trunk/arch/m68knommu/include/asm/resource.h deleted file mode 100644 index 7fa63d5ea576..000000000000 --- a/trunk/arch/m68knommu/include/asm/resource.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/rtc.h b/trunk/arch/m68knommu/include/asm/rtc.h deleted file mode 100644 index eaf18ec83c8e..000000000000 --- a/trunk/arch/m68knommu/include/asm/rtc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/sections.h b/trunk/arch/m68knommu/include/asm/sections.h deleted file mode 100644 index dd0ecb98ec08..000000000000 --- a/trunk/arch/m68knommu/include/asm/sections.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _M68KNOMMU_SECTIONS_H -#define _M68KNOMMU_SECTIONS_H - -/* nothing to see, move along */ -#include - -#endif diff --git a/trunk/arch/m68knommu/include/asm/sembuf.h b/trunk/arch/m68knommu/include/asm/sembuf.h deleted file mode 100644 index 3a634f9ecf50..000000000000 --- a/trunk/arch/m68knommu/include/asm/sembuf.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/shm.h b/trunk/arch/m68knommu/include/asm/shm.h deleted file mode 100644 index cc8e522d9050..000000000000 --- a/trunk/arch/m68knommu/include/asm/shm.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/shmbuf.h b/trunk/arch/m68knommu/include/asm/shmbuf.h deleted file mode 100644 index bc34cf8eefce..000000000000 --- a/trunk/arch/m68knommu/include/asm/shmbuf.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/shmparam.h b/trunk/arch/m68knommu/include/asm/shmparam.h deleted file mode 100644 index d7ee69648ebf..000000000000 --- a/trunk/arch/m68knommu/include/asm/shmparam.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/socket.h b/trunk/arch/m68knommu/include/asm/socket.h deleted file mode 100644 index ac5478bf6371..000000000000 --- a/trunk/arch/m68knommu/include/asm/socket.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/sockios.h b/trunk/arch/m68knommu/include/asm/sockios.h deleted file mode 100644 index dcc6a8900ce2..000000000000 --- a/trunk/arch/m68knommu/include/asm/sockios.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/spinlock.h b/trunk/arch/m68knommu/include/asm/spinlock.h deleted file mode 100644 index 6bb1f06c4781..000000000000 --- a/trunk/arch/m68knommu/include/asm/spinlock.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/stat.h b/trunk/arch/m68knommu/include/asm/stat.h deleted file mode 100644 index 3d4b260e7c03..000000000000 --- a/trunk/arch/m68knommu/include/asm/stat.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/statfs.h b/trunk/arch/m68knommu/include/asm/statfs.h deleted file mode 100644 index 2ce99eaf0970..000000000000 --- a/trunk/arch/m68knommu/include/asm/statfs.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/termbits.h b/trunk/arch/m68knommu/include/asm/termbits.h deleted file mode 100644 index 05dd6bc27285..000000000000 --- a/trunk/arch/m68knommu/include/asm/termbits.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/termios.h b/trunk/arch/m68knommu/include/asm/termios.h deleted file mode 100644 index e7337881a985..000000000000 --- a/trunk/arch/m68knommu/include/asm/termios.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/tlb.h b/trunk/arch/m68knommu/include/asm/tlb.h deleted file mode 100644 index 77a7c51ca299..000000000000 --- a/trunk/arch/m68knommu/include/asm/tlb.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/types.h b/trunk/arch/m68knommu/include/asm/types.h deleted file mode 100644 index 031238c2d180..000000000000 --- a/trunk/arch/m68knommu/include/asm/types.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/m68knommu/include/asm/user.h b/trunk/arch/m68knommu/include/asm/user.h deleted file mode 100644 index a5a555b761c4..000000000000 --- a/trunk/arch/m68knommu/include/asm/user.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/arch/s390/include/asm/elf.h b/trunk/arch/s390/include/asm/elf.h index d480f39d65e6..74d0bbb7d955 100644 --- a/trunk/arch/s390/include/asm/elf.h +++ b/trunk/arch/s390/include/asm/elf.h @@ -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__ */ diff --git a/trunk/arch/s390/kernel/compat_wrapper.S b/trunk/arch/s390/kernel/compat_wrapper.S index 6035cd20c7a7..62c706eb0de6 100644 --- a/trunk/arch/s390/kernel/compat_wrapper.S +++ b/trunk/arch/s390/kernel/compat_wrapper.S @@ -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 diff --git a/trunk/arch/s390/kernel/syscalls.S b/trunk/arch/s390/kernel/syscalls.S index 76d16e0140bb..fe5b25a988ab 100644 --- a/trunk/arch/s390/kernel/syscalls.S +++ b/trunk/arch/s390/kernel/syscalls.S @@ -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) diff --git a/trunk/arch/s390/kernel/time.c b/trunk/arch/s390/kernel/time.c index d649600df5b9..fc468cae4460 100644 --- a/trunk/arch/s390/kernel/time.c +++ b/trunk/arch/s390/kernel/time.c @@ -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(); } /* diff --git a/trunk/arch/s390/kernel/vtime.c b/trunk/arch/s390/kernel/vtime.c index 2fb36e462194..ecf0304e61c1 100644 --- a/trunk/arch/s390/kernel/vtime.c +++ b/trunk/arch/s390/kernel/vtime.c @@ -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)); diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig index f32a5197128d..ebabe518e729 100644 --- a/trunk/arch/sh/Kconfig +++ b/trunk/arch/sh/Kconfig @@ -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 - (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" diff --git a/trunk/arch/sh/boards/board-ap325rxa.c b/trunk/arch/sh/boards/board-ap325rxa.c index 1c67cba6e34f..caf4c33f4e84 100644 --- a/trunk/arch/sh/boards/board-ap325rxa.c +++ b/trunk/arch/sh/boards/board-ap325rxa.c @@ -18,8 +18,10 @@ #include #include #include -#include +#include #include +#include +#include #include #include #include