diff options
-rw-r--r-- | arch/sh/Makefile | 61 | ||||
-rw-r--r-- | arch/sh/boards/cayman/irq.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/cayman/setup.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/dreamcast/irq.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/dreamcast/setup.c | 4 | ||||
-rw-r--r-- | arch/sh/boards/hp6xx/pm.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/hp6xx/pm_wakeup.S | 2 | ||||
-rw-r--r-- | arch/sh/boards/hp6xx/setup.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/landisk/gio.c | 4 | ||||
-rw-r--r-- | arch/sh/boards/landisk/irq.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/landisk/psw.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/landisk/setup.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/renesas/r7780rp/psw.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/se/7343/io.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/se/7343/setup.c | 4 | ||||
-rw-r--r-- | arch/sh/boards/sh03/setup.c | 4 | ||||
-rw-r--r-- | arch/sh/boards/snapgear/setup.c | 2 | ||||
-rw-r--r-- | arch/sh/boot/compressed/head_64.S | 4 | ||||
-rw-r--r-- | arch/sh/drivers/dma/dma-g2.c | 4 | ||||
-rw-r--r-- | arch/sh/drivers/dma/dma-pvr2.c | 4 | ||||
-rw-r--r-- | arch/sh/drivers/dma/dma-sh.c | 2 | ||||
-rw-r--r-- | arch/sh/drivers/dma/dma-sh.h | 2 | ||||
-rw-r--r-- | arch/sh/drivers/pci/fixups-dreamcast.c | 2 | ||||
-rw-r--r-- | arch/sh/drivers/pci/ops-cayman.c | 2 | ||||
-rw-r--r-- | arch/sh/drivers/pci/ops-dreamcast.c | 2 | ||||
-rw-r--r-- | arch/sh/drivers/pci/pci-sh5.c | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/.gitignore (renamed from include/asm-sh/.gitignore) | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/Kbuild (renamed from include/asm-sh/Kbuild) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/a.out.h (renamed from include/asm-sh/a.out.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/adc.h (renamed from include/asm-sh/adc.h) | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/addrspace.h (renamed from include/asm-sh/addrspace.h) | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/atomic-grb.h (renamed from include/asm-sh/atomic-grb.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/atomic-irq.h (renamed from include/asm-sh/atomic-irq.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/atomic-llsc.h (renamed from include/asm-sh/atomic-llsc.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/atomic.h (renamed from include/asm-sh/atomic.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/auxvec.h (renamed from include/asm-sh/auxvec.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/bitops-grb.h (renamed from include/asm-sh/bitops-grb.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/bitops-irq.h (renamed from include/asm-sh/bitops-irq.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/bitops.h (renamed from include/asm-sh/bitops.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/bug.h (renamed from include/asm-sh/bug.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/bugs.h (renamed from include/asm-sh/bugs.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/byteorder.h (renamed from include/asm-sh/byteorder.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/cache.h (renamed from include/asm-sh/cache.h) | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/cacheflush.h (renamed from include/asm-sh/cacheflush.h) | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/checksum.h (renamed from include/asm-sh/checksum.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/checksum_32.h (renamed from include/asm-sh/checksum_32.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/checksum_64.h (renamed from include/asm-sh/checksum_64.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/clock.h (renamed from include/asm-sh/clock.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/cmpxchg-grb.h (renamed from include/asm-sh/cmpxchg-grb.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/cmpxchg-irq.h (renamed from include/asm-sh/cmpxchg-irq.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/cpu-features.h (renamed from include/asm-sh/cpu-features.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/cputime.h (renamed from include/asm-sh/cputime.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/current.h (renamed from include/asm-sh/current.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/delay.h (renamed from include/asm-sh/delay.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/device.h (renamed from include/asm-sh/device.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/div64.h (renamed from include/asm-sh/div64.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/dma-mapping.h (renamed from include/asm-sh/dma-mapping.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/dma.h (renamed from include/asm-sh/dma.h) | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/dmabrg.h (renamed from include/asm-sh/dmabrg.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/edosk7705.h (renamed from include/asm-sh/edosk7705.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/elf.h (renamed from include/asm-sh/elf.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/emergency-restart.h (renamed from include/asm-sh/emergency-restart.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/entry-macros.S (renamed from include/asm-sh/entry-macros.S) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/errno.h (renamed from include/asm-sh/errno.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/fb.h (renamed from include/asm-sh/fb.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/fcntl.h (renamed from include/asm-sh/fcntl.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/fixmap.h (renamed from include/asm-sh/fixmap.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/flat.h (renamed from include/asm-sh/flat.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/fpu.h (renamed from include/asm-sh/fpu.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/freq.h (renamed from include/asm-sh/freq.h) | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/futex-irq.h (renamed from include/asm-sh/futex-irq.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/futex.h (renamed from include/asm-sh/futex.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/gpio.h (renamed from include/asm-sh/gpio.h) | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/hardirq.h (renamed from include/asm-sh/hardirq.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/hd64461.h (renamed from include/asm-sh/hd64461.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/hd64465/gpio.h (renamed from include/asm-sh/hd64465/gpio.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/hd64465/hd64465.h (renamed from include/asm-sh/hd64465/hd64465.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/hd64465/io.h (renamed from include/asm-sh/hd64465/io.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/heartbeat.h (renamed from include/asm-sh/heartbeat.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/hp6xx.h (renamed from include/asm-sh/hp6xx.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/hugetlb.h (renamed from include/asm-sh/hugetlb.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/hw_irq.h (renamed from include/asm-sh/hw_irq.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/i2c-sh7760.h (renamed from include/asm-sh/i2c-sh7760.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/ilsel.h (renamed from include/asm-sh/ilsel.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/io.h (renamed from include/asm-sh/io.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/io_generic.h (renamed from include/asm-sh/io_generic.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/io_trapped.h (renamed from include/asm-sh/io_trapped.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/ioctl.h (renamed from include/asm-sh/ioctl.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/ioctls.h (renamed from include/asm-sh/ioctls.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/ipcbuf.h (renamed from include/asm-sh/ipcbuf.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/irq.h (renamed from include/asm-sh/irq.h) | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/irq_regs.h (renamed from include/asm-sh/irq_regs.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/irqflags.h (renamed from include/asm-sh/irqflags.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/irqflags_32.h (renamed from include/asm-sh/irqflags_32.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/irqflags_64.h (renamed from include/asm-sh/irqflags_64.h) | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/kdebug.h (renamed from include/asm-sh/kdebug.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/kexec.h (renamed from include/asm-sh/kexec.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/kgdb.h (renamed from include/asm-sh/kgdb.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/kmap_types.h (renamed from include/asm-sh/kmap_types.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/lboxre2.h (renamed from include/asm-sh/lboxre2.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/linkage.h (renamed from include/asm-sh/linkage.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/local.h (renamed from include/asm-sh/local.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/machvec.h (renamed from include/asm-sh/machvec.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/magicpanelr2.h (renamed from include/asm-sh/magicpanelr2.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/mc146818rtc.h (renamed from include/asm-sh/mc146818rtc.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/microdev.h (renamed from include/asm-sh/microdev.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/migor.h (renamed from include/asm-sh/migor.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/mman.h (renamed from include/asm-sh/mman.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/mmu.h (renamed from include/asm-sh/mmu.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/mmu_context.h (renamed from include/asm-sh/mmu_context.h) | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/mmu_context_32.h (renamed from include/asm-sh/mmu_context_32.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/mmu_context_64.h (renamed from include/asm-sh/mmu_context_64.h) | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/mmzone.h (renamed from include/asm-sh/mmzone.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/module.h (renamed from include/asm-sh/module.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/msgbuf.h (renamed from include/asm-sh/msgbuf.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/mutex.h (renamed from include/asm-sh/mutex.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/page.h (renamed from include/asm-sh/page.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/param.h (renamed from include/asm-sh/param.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/parport.h (renamed from include/asm-sh/parport.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/pci.h (renamed from include/asm-sh/pci.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/percpu.h (renamed from include/asm-sh/percpu.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/pgalloc.h (renamed from include/asm-sh/pgalloc.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/pgtable.h (renamed from include/asm-sh/pgtable.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/pgtable_32.h (renamed from include/asm-sh/pgtable_32.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/pgtable_64.h (renamed from include/asm-sh/pgtable_64.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/pm.h (renamed from include/asm-sh/pm.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/poll.h (renamed from include/asm-sh/poll.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/posix_types.h (renamed from include/asm-sh/posix_types.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/posix_types_32.h (renamed from include/asm-sh/posix_types_32.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/posix_types_64.h (renamed from include/asm-sh/posix_types_64.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/processor.h (renamed from include/asm-sh/processor.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/processor_32.h (renamed from include/asm-sh/processor_32.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/processor_64.h (renamed from include/asm-sh/processor_64.h) | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/ptrace.h (renamed from include/asm-sh/ptrace.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/push-switch.h (renamed from include/asm-sh/push-switch.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/r7780rp.h (renamed from include/asm-sh/r7780rp.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/resource.h (renamed from include/asm-sh/resource.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/rtc.h (renamed from include/asm-sh/rtc.h) | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/rts7751r2d.h (renamed from include/asm-sh/rts7751r2d.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/rwsem.h (renamed from include/asm-sh/rwsem.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/scatterlist.h (renamed from include/asm-sh/scatterlist.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/sdk7780.h (renamed from include/asm-sh/sdk7780.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/se.h (renamed from include/asm-sh/se.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/se7206.h (renamed from include/asm-sh/se7206.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/se7343.h (renamed from include/asm-sh/se7343.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/se7721.h (renamed from include/asm-sh/se7721.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/se7722.h (renamed from include/asm-sh/se7722.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/se7751.h (renamed from include/asm-sh/se7751.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/se7780.h (renamed from include/asm-sh/se7780.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/sections.h (renamed from include/asm-sh/sections.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/segment.h (renamed from include/asm-sh/segment.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/sembuf.h (renamed from include/asm-sh/sembuf.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/serial.h (renamed from include/asm-sh/serial.h) | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/setup.h (renamed from include/asm-sh/setup.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/sfp-machine.h (renamed from include/asm-sh/sfp-machine.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/sh7760fb.h (renamed from include/asm-sh/sh7760fb.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/sh7763rdp.h (renamed from include/asm-sh/sh7763rdp.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/sh7785lcr.h (renamed from include/asm-sh/sh7785lcr.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/sh_bios.h (renamed from include/asm-sh/sh_bios.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/sh_keysc.h (renamed from include/asm-sh/sh_keysc.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/sh_mobile_lcdc.h (renamed from include/asm-sh/sh_mobile_lcdc.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/shmbuf.h (renamed from include/asm-sh/shmbuf.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/shmin.h (renamed from include/asm-sh/shmin.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/shmparam.h (renamed from include/asm-sh/shmparam.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/sigcontext.h (renamed from include/asm-sh/sigcontext.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/siginfo.h (renamed from include/asm-sh/siginfo.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/signal.h (renamed from include/asm-sh/signal.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/smc37c93x.h (renamed from include/asm-sh/smc37c93x.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/smp.h (renamed from include/asm-sh/smp.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/snapgear.h (renamed from include/asm-sh/snapgear.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/socket.h (renamed from include/asm-sh/socket.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/sockios.h (renamed from include/asm-sh/sockios.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/sparsemem.h (renamed from include/asm-sh/sparsemem.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/spi.h (renamed from include/asm-sh/spi.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/spinlock.h (renamed from include/asm-sh/spinlock.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/spinlock_types.h (renamed from include/asm-sh/spinlock_types.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/stat.h (renamed from include/asm-sh/stat.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/statfs.h (renamed from include/asm-sh/statfs.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/string.h (renamed from include/asm-sh/string.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/string_32.h (renamed from include/asm-sh/string_32.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/string_64.h (renamed from include/asm-sh/string_64.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/system.h (renamed from include/asm-sh/system.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/system_32.h (renamed from include/asm-sh/system_32.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/system_64.h (renamed from include/asm-sh/system_64.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/systemh7751.h (renamed from include/asm-sh/systemh7751.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/termbits.h (renamed from include/asm-sh/termbits.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/termios.h (renamed from include/asm-sh/termios.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/thread_info.h (renamed from include/asm-sh/thread_info.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/timer.h (renamed from include/asm-sh/timer.h) | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/timex.h (renamed from include/asm-sh/timex.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/titan.h (renamed from include/asm-sh/titan.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/tlb.h (renamed from include/asm-sh/tlb.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/tlb_64.h (renamed from include/asm-sh/tlb_64.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/tlbflush.h (renamed from include/asm-sh/tlbflush.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/topology.h (renamed from include/asm-sh/topology.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/types.h (renamed from include/asm-sh/types.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/uaccess.h (renamed from include/asm-sh/uaccess.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/uaccess_32.h (renamed from include/asm-sh/uaccess_32.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/uaccess_64.h (renamed from include/asm-sh/uaccess_64.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/ubc.h (renamed from include/asm-sh/ubc.h) | 2 | ||||
-rw-r--r-- | arch/sh/include/asm/ucontext.h (renamed from include/asm-sh/ucontext.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/unaligned.h (renamed from include/asm-sh/unaligned.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/unistd.h (renamed from include/asm-sh/unistd.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/unistd_32.h (renamed from include/asm-sh/unistd_32.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/unistd_64.h (renamed from include/asm-sh/unistd_64.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/user.h (renamed from include/asm-sh/user.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/vga.h (renamed from include/asm-sh/vga.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/asm/watchdog.h (renamed from include/asm-sh/watchdog.h) | 4 | ||||
-rw-r--r-- | arch/sh/include/asm/xor.h (renamed from include/asm-sh/xor.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh2/cpu/addrspace.h (renamed from include/asm-sh/cpu-sh2/addrspace.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh2/cpu/cache.h (renamed from include/asm-sh/cpu-sh2/cache.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh2/cpu/cacheflush.h (renamed from include/asm-sh/cpu-sh2/cacheflush.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh2/cpu/dma.h (renamed from include/asm-sh/cpu-sh2/dma.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh2/cpu/freq.h (renamed from include/asm-sh/cpu-sh2/freq.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh2/cpu/mmu_context.h (renamed from include/asm-sh/cpu-sh2/mmu_context.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh2/cpu/rtc.h (renamed from include/asm-sh/cpu-sh2/rtc.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh2/cpu/sigcontext.h (renamed from include/asm-sh/cpu-sh2/sigcontext.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh2/cpu/timer.h (renamed from include/asm-sh/cpu-sh2/timer.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh2/cpu/ubc.h (renamed from include/asm-sh/cpu-sh2/ubc.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh2/cpu/watchdog.h (renamed from include/asm-sh/cpu-sh2/watchdog.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh2a/cpu/addrspace.h (renamed from include/asm-sh/cpu-sh2a/addrspace.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh2a/cpu/cache.h (renamed from include/asm-sh/cpu-sh2a/cache.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh2a/cpu/cacheflush.h | 44 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh2a/cpu/dma.h | 23 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh2a/cpu/freq.h (renamed from include/asm-sh/cpu-sh2a/freq.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh2a/cpu/mmu_context.h | 16 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh2a/cpu/rtc.h (renamed from include/asm-sh/cpu-sh2a/rtc.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh2a/cpu/timer.h | 6 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh2a/cpu/ubc.h | 32 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh2a/cpu/watchdog.h | 69 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh3/cpu/adc.h (renamed from include/asm-sh/cpu-sh3/adc.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh3/cpu/addrspace.h (renamed from include/asm-sh/cpu-sh3/addrspace.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh3/cpu/cache.h (renamed from include/asm-sh/cpu-sh3/cache.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh3/cpu/cacheflush.h (renamed from include/asm-sh/cpu-sh3/cacheflush.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh3/cpu/dac.h (renamed from include/asm-sh/cpu-sh3/dac.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh3/cpu/dma.h (renamed from include/asm-sh/cpu-sh3/dma.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh3/cpu/freq.h (renamed from include/asm-sh/cpu-sh3/freq.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh3/cpu/gpio.h (renamed from include/asm-sh/cpu-sh3/gpio.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh3/cpu/mmu_context.h (renamed from include/asm-sh/cpu-sh3/mmu_context.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh3/cpu/rtc.h (renamed from include/asm-sh/cpu-sh3/rtc.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh3/cpu/sigcontext.h (renamed from include/asm-sh/cpu-sh3/sigcontext.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh3/cpu/timer.h (renamed from include/asm-sh/cpu-sh3/timer.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh3/cpu/ubc.h (renamed from include/asm-sh/cpu-sh3/ubc.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh3/cpu/watchdog.h (renamed from include/asm-sh/cpu-sh3/watchdog.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh4/cpu/addrspace.h (renamed from include/asm-sh/cpu-sh4/addrspace.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh4/cpu/cache.h (renamed from include/asm-sh/cpu-sh4/cache.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh4/cpu/cacheflush.h (renamed from include/asm-sh/cpu-sh4/cacheflush.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh4/cpu/dma-sh7780.h (renamed from include/asm-sh/cpu-sh4/dma-sh7780.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh4/cpu/dma.h (renamed from include/asm-sh/cpu-sh4/dma.h) | 2 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh4/cpu/fpu.h (renamed from include/asm-sh/cpu-sh4/fpu.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh4/cpu/freq.h (renamed from include/asm-sh/cpu-sh4/freq.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh4/cpu/mmu_context.h (renamed from include/asm-sh/cpu-sh4/mmu_context.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh4/cpu/rtc.h (renamed from include/asm-sh/cpu-sh4/rtc.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh4/cpu/sigcontext.h (renamed from include/asm-sh/cpu-sh4/sigcontext.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh4/cpu/sq.h (renamed from include/asm-sh/cpu-sh4/sq.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh4/cpu/timer.h (renamed from include/asm-sh/cpu-sh4/timer.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh4/cpu/ubc.h (renamed from include/asm-sh/cpu-sh4/ubc.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh4/cpu/watchdog.h (renamed from include/asm-sh/cpu-sh4/watchdog.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh5/cpu/addrspace.h (renamed from include/asm-sh/cpu-sh5/addrspace.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh5/cpu/cache.h (renamed from include/asm-sh/cpu-sh5/cache.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh5/cpu/cacheflush.h (renamed from include/asm-sh/cpu-sh5/cacheflush.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh5/cpu/dma.h (renamed from include/asm-sh/cpu-sh5/dma.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh5/cpu/irq.h (renamed from include/asm-sh/cpu-sh5/irq.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh5/cpu/mmu_context.h (renamed from include/asm-sh/cpu-sh5/mmu_context.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh5/cpu/registers.h (renamed from include/asm-sh/cpu-sh5/registers.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh5/cpu/rtc.h (renamed from include/asm-sh/cpu-sh5/rtc.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh5/cpu/timer.h (renamed from include/asm-sh/cpu-sh5/timer.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/mach-dreamcast/mach/dma.h (renamed from include/asm-sh/dreamcast/dma.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/mach-dreamcast/mach/maple.h (renamed from include/asm-sh/dreamcast/maple.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/mach-dreamcast/mach/pci.h (renamed from include/asm-sh/dreamcast/pci.h) | 2 | ||||
-rw-r--r-- | arch/sh/include/mach-dreamcast/mach/sysasic.h (renamed from include/asm-sh/dreamcast/sysasic.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/mach-landisk/mach/gio.h (renamed from include/asm-sh/landisk/gio.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/mach-landisk/mach/iodata_landisk.h (renamed from include/asm-sh/landisk/iodata_landisk.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/mach-sh03/mach/io.h (renamed from include/asm-sh/sh03/io.h) | 0 | ||||
-rw-r--r-- | arch/sh/include/mach-sh03/mach/sh03.h (renamed from include/asm-sh/sh03/sh03.h) | 0 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/irq/intc-sh5.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh2/entry.S | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh2a/entry.S | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh3/entry.S | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4/fpu.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4/softfloat.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4/sq.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh5/entry.S | 2 | ||||
-rw-r--r-- | arch/sh/kernel/head_64.S | 4 | ||||
-rw-r--r-- | arch/sh/kernel/irq.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/time_64.c | 4 | ||||
-rw-r--r-- | arch/sh/lib64/panic.c | 2 | ||||
-rw-r--r-- | arch/sh/mm/fault_64.c | 2 | ||||
-rw-r--r-- | arch/sh/tools/Makefile | 4 | ||||
-rw-r--r-- | include/asm-sh/cpu-sh2a/cacheflush.h | 1 | ||||
-rw-r--r-- | include/asm-sh/cpu-sh2a/dma.h | 1 | ||||
-rw-r--r-- | include/asm-sh/cpu-sh2a/mmu_context.h | 1 | ||||
-rw-r--r-- | include/asm-sh/cpu-sh2a/timer.h | 1 | ||||
-rw-r--r-- | include/asm-sh/cpu-sh2a/ubc.h | 1 | ||||
-rw-r--r-- | include/asm-sh/cpu-sh2a/watchdog.h | 1 | ||||
-rw-r--r-- | sound/sh/aica.c | 2 |
296 files changed, 268 insertions, 131 deletions
diff --git a/arch/sh/Makefile b/arch/sh/Makefile index c627e45..fbf8756 100644 --- a/arch/sh/Makefile +++ b/arch/sh/Makefile @@ -91,8 +91,6 @@ LDFLAGS_vmlinux += --defsym 'jiffies=jiffies_64+4' LDFLAGS += -EB endif -KBUILD_CFLAGS += -pipe $(cflags-y) -KBUILD_AFLAGS += $(cflags-y) head-y := arch/sh/kernel/init_task.o head-$(CONFIG_SUPERH32) += arch/sh/kernel/head_32.o @@ -160,57 +158,17 @@ drivers-$(CONFIG_OPROFILE) += arch/sh/oprofile/ boot := arch/sh/boot -ifneq ($(KBUILD_SRC),) -incdir-prefix := $(srctree)/include/asm-sh/ -else -incdir-prefix := -endif - -# Update machine arch and proc symlinks if something which affects -# them changed. We use .arch and .mach to indicate when they were -# updated last, otherwise make uses the target directory mtime. +cflags-y += -Iarch/sh/include/$(cpuincdir-y) +cflags-y += $(foreach d, $(incdir-y), -Iarch/sh/include/mach-$(d)) -include/asm-sh/.cpu: $(wildcard include/config/cpu/*.h) \ - include/config/auto.conf FORCE - @echo ' SYMLINK include/asm-sh/cpu -> include/asm-sh/$(cpuincdir-y)' - $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi - $(Q)ln -fsn $(incdir-prefix)$(cpuincdir-y) include/asm-sh/cpu - @touch $@ - -# Most boards have their own mach directories. For the ones that -# don't, just reference the parent directory so the semantics are -# kept roughly the same. -# -# When multiple boards are compiled in at the same time, preference -# for the mach link is given to whichever has a directory for its -# headers. However, this is only a workaround until platforms that -# can live in the same kernel image back away from relying on the -# mach link. - -include/asm-sh/.mach: $(wildcard include/config/sh/*.h) \ - include/config/auto.conf FORCE - $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi - $(Q)rm -f include/asm-sh/mach - $(Q)for i in $(incdir-y); do \ - if [ -d $(srctree)/include/asm-sh/$$i ]; then \ - echo -n ' SYMLINK include/asm-sh/mach -> '; \ - echo -e "include/asm-sh/$$i"; \ - ln -fsn $(incdir-prefix)$$i \ - include/asm-sh/mach; \ - else \ - if [ ! -d include/asm-sh/mach ]; then \ - echo -n ' SYMLINK include/asm-sh/mach -> '; \ - echo -e 'include/asm-sh'; \ - ln -fsn $(incdir-prefix)../asm-sh include/asm-sh/mach; \ - fi; \ - fi; \ - done - @touch $@ +KBUILD_CFLAGS += -pipe $(cflags-y) +KBUILD_CPPFLAGS += $(cflags-y) +KBUILD_AFLAGS += $(cflags-y) PHONY += maketools FORCE maketools: include/linux/version.h FORCE - $(Q)$(MAKE) $(build)=arch/sh/tools include/asm-sh/machtypes.h + $(Q)$(MAKE) $(build)=arch/sh/tools arch/sh/include/asm/machtypes.h all: $(KBUILD_IMAGE) @@ -219,8 +177,7 @@ zImage uImage uImage.srec vmlinux.srec: vmlinux compressed: zImage -archprepare: include/asm-sh/.cpu include/asm-sh/.mach maketools \ - arch/sh/lib64/syscalltab.h +archprepare: maketools arch/sh/lib64/syscalltab.h archclean: $(Q)$(MAKE) $(clean)=$(boot) @@ -262,6 +219,4 @@ arch/sh/lib64/syscalltab.h: arch/sh/kernel/syscalls_64.S $(call filechk,gen-syscalltab) CLEAN_FILES += arch/sh/lib64/syscalltab.h \ - include/asm-sh/machtypes.h \ - include/asm-sh/cpu include/asm-sh/.cpu \ - include/asm-sh/mach include/asm-sh/.mach + arch/sh/include/asm/machtypes.h diff --git a/arch/sh/boards/cayman/irq.c b/arch/sh/boards/cayman/irq.c index 30ec7be..ceb37ae 100644 --- a/arch/sh/boards/cayman/irq.c +++ b/arch/sh/boards/cayman/irq.c @@ -13,7 +13,7 @@ #include <linux/irq.h> #include <linux/interrupt.h> #include <linux/signal.h> -#include <asm/cpu/irq.h> +#include <cpu/irq.h> #include <asm/page.h> /* Setup for the SMSC FDC37C935 / LAN91C100FD */ diff --git a/arch/sh/boards/cayman/setup.c b/arch/sh/boards/cayman/setup.c index 8c9fa47..e7f9cc5 100644 --- a/arch/sh/boards/cayman/setup.c +++ b/arch/sh/boards/cayman/setup.c @@ -13,7 +13,7 @@ #include <linux/init.h> #include <linux/io.h> #include <linux/kernel.h> -#include <asm/cpu/irq.h> +#include <cpu/irq.h> /* * Platform Dependent Interrupt Priorities. diff --git a/arch/sh/boards/dreamcast/irq.c b/arch/sh/boards/dreamcast/irq.c index 9d0673a..67bdc33 100644 --- a/arch/sh/boards/dreamcast/irq.c +++ b/arch/sh/boards/dreamcast/irq.c @@ -12,7 +12,7 @@ #include <linux/irq.h> #include <asm/io.h> #include <asm/irq.h> -#include <asm/dreamcast/sysasic.h> +#include <mach/sysasic.h> /* Dreamcast System ASIC Hardware Events - diff --git a/arch/sh/boards/dreamcast/setup.c b/arch/sh/boards/dreamcast/setup.c index 2581c8c..14c3e57 100644 --- a/arch/sh/boards/dreamcast/setup.c +++ b/arch/sh/boards/dreamcast/setup.c @@ -25,8 +25,8 @@ #include <asm/io.h> #include <asm/irq.h> #include <asm/rtc.h> -#include <asm/machvec.h> -#include <asm/mach/sysasic.h> +#include <machvec.h> +#include <mach/sysasic.h> extern struct hw_interrupt_type systemasic_int; extern void aica_time_init(void); diff --git a/arch/sh/boards/hp6xx/pm.c b/arch/sh/boards/hp6xx/pm.c index d22f6ea..e96684d 100644 --- a/arch/sh/boards/hp6xx/pm.c +++ b/arch/sh/boards/hp6xx/pm.c @@ -13,7 +13,7 @@ #include <asm/io.h> #include <asm/hd64461.h> #include <asm/hp6xx.h> -#include <asm/cpu/dac.h> +#include <cpu/dac.h> #include <asm/pm.h> #define STBCR 0xffffff82 diff --git a/arch/sh/boards/hp6xx/pm_wakeup.S b/arch/sh/boards/hp6xx/pm_wakeup.S index 45e9bf0..44b648c 100644 --- a/arch/sh/boards/hp6xx/pm_wakeup.S +++ b/arch/sh/boards/hp6xx/pm_wakeup.S @@ -8,7 +8,7 @@ */ #include <linux/linkage.h> -#include <asm/cpu/mmu_context.h> +#include <cpu/mmu_context.h> #define k0 r0 #define k1 r1 diff --git a/arch/sh/boards/hp6xx/setup.c b/arch/sh/boards/hp6xx/setup.c index 2f414ac..475b46c 100644 --- a/arch/sh/boards/hp6xx/setup.c +++ b/arch/sh/boards/hp6xx/setup.c @@ -16,7 +16,7 @@ #include <asm/io.h> #include <asm/irq.h> #include <asm/hp6xx.h> -#include <asm/cpu/dac.h> +#include <cpu/dac.h> #define SCPCR 0xa4000116 #define SCPDR 0xa4000136 diff --git a/arch/sh/boards/landisk/gio.c b/arch/sh/boards/landisk/gio.c index 0c15b0a..edcde08 100644 --- a/arch/sh/boards/landisk/gio.c +++ b/arch/sh/boards/landisk/gio.c @@ -20,8 +20,8 @@ #include <linux/fs.h> #include <asm/io.h> #include <asm/uaccess.h> -#include <asm/landisk/gio.h> -#include <asm/landisk/iodata_landisk.h> +#include <mach/gio.h> +#include <mach/iodata_landisk.h> #define DEVCOUNT 4 #define GIO_MINOR 2 /* GIO minor no. */ diff --git a/arch/sh/boards/landisk/irq.c b/arch/sh/boards/landisk/irq.c index 2586494..d0f9378 100644 --- a/arch/sh/boards/landisk/irq.c +++ b/arch/sh/boards/landisk/irq.c @@ -16,7 +16,7 @@ #include <linux/irq.h> #include <linux/interrupt.h> #include <linux/io.h> -#include <asm/landisk/iodata_landisk.h> +#include <mach/iodata_landisk.h> static void disable_landisk_irq(unsigned int irq) { diff --git a/arch/sh/boards/landisk/psw.c b/arch/sh/boards/landisk/psw.c index 5a9b70b..4bd502c 100644 --- a/arch/sh/boards/landisk/psw.c +++ b/arch/sh/boards/landisk/psw.c @@ -14,7 +14,7 @@ #include <linux/init.h> #include <linux/interrupt.h> #include <linux/platform_device.h> -#include <asm/landisk/iodata_landisk.h> +#include <mach/iodata_landisk.h> #include <asm/push-switch.h> static irqreturn_t psw_irq_handler(int irq, void *arg) diff --git a/arch/sh/boards/landisk/setup.c b/arch/sh/boards/landisk/setup.c index 2b708ec..470c781 100644 --- a/arch/sh/boards/landisk/setup.c +++ b/arch/sh/boards/landisk/setup.c @@ -18,7 +18,7 @@ #include <linux/pm.h> #include <linux/mm.h> #include <asm/machvec.h> -#include <asm/landisk/iodata_landisk.h> +#include <mach/iodata_landisk.h> #include <asm/io.h> void init_landisk_IRQ(void); diff --git a/arch/sh/boards/renesas/r7780rp/psw.c b/arch/sh/boards/renesas/r7780rp/psw.c index c844dfa..0b3e062 100644 --- a/arch/sh/boards/renesas/r7780rp/psw.c +++ b/arch/sh/boards/renesas/r7780rp/psw.c @@ -13,7 +13,7 @@ #include <linux/init.h> #include <linux/interrupt.h> #include <linux/platform_device.h> -#include <asm/mach/r7780rp.h> +#include <mach/r7780rp.h> #include <asm/push-switch.h> static irqreturn_t psw_irq_handler(int irq, void *arg) diff --git a/arch/sh/boards/se/7343/io.c b/arch/sh/boards/se/7343/io.c index 3a6d114..e2fae32 100644 --- a/arch/sh/boards/se/7343/io.c +++ b/arch/sh/boards/se/7343/io.c @@ -6,7 +6,7 @@ */ #include <linux/kernel.h> #include <asm/io.h> -#include <asm/mach/se7343.h> +#include <mach/se7343.h> #define badio(fn, a) panic("bad i/o operation %s for %08lx.", #fn, a) diff --git a/arch/sh/boards/se/7343/setup.c b/arch/sh/boards/se/7343/setup.c index 8ae718d..59dc92e 100644 --- a/arch/sh/boards/se/7343/setup.c +++ b/arch/sh/boards/se/7343/setup.c @@ -1,8 +1,8 @@ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/mtd/physmap.h> -#include <asm/machvec.h> -#include <asm/mach/se7343.h> +#include <machvec.h> +#include <mach/se7343.h> #include <asm/heartbeat.h> #include <asm/irq.h> #include <asm/io.h> diff --git a/arch/sh/boards/sh03/setup.c b/arch/sh/boards/sh03/setup.c index 934ac4f1..cd9cff1 100644 --- a/arch/sh/boards/sh03/setup.c +++ b/arch/sh/boards/sh03/setup.c @@ -11,8 +11,8 @@ #include <linux/platform_device.h> #include <asm/io.h> #include <asm/rtc.h> -#include <asm/sh03/io.h> -#include <asm/sh03/sh03.h> +#include <mach/io.h> +#include <mach/sh03.h> #include <asm/addrspace.h> static void __init init_sh03_IRQ(void) diff --git a/arch/sh/boards/snapgear/setup.c b/arch/sh/boards/snapgear/setup.c index 7022483..a5e349d 100644 --- a/arch/sh/boards/snapgear/setup.c +++ b/arch/sh/boards/snapgear/setup.c @@ -22,7 +22,7 @@ #include <asm/snapgear.h> #include <asm/irq.h> #include <asm/io.h> -#include <asm/cpu/timer.h> +#include <cpu/timer.h> /* * EraseConfig handling functions diff --git a/arch/sh/boot/compressed/head_64.S b/arch/sh/boot/compressed/head_64.S index f72c198..622eac3 100644 --- a/arch/sh/boot/compressed/head_64.S +++ b/arch/sh/boot/compressed/head_64.S @@ -14,8 +14,8 @@ * Copyright (C) 2002 Stuart Menefy (stuart.menefy@st.com) */ #include <asm/cache.h> -#include <asm/cpu/mmu_context.h> -#include <asm/cpu/registers.h> +#include <cpu/mmu_context.h> +#include <cpu/registers.h> /* * Fixed TLB entries to identity map the beginning of RAM diff --git a/arch/sh/drivers/dma/dma-g2.c b/arch/sh/drivers/dma/dma-g2.c index 0caf11b..af7bb58 100644 --- a/arch/sh/drivers/dma/dma-g2.c +++ b/arch/sh/drivers/dma/dma-g2.c @@ -14,8 +14,8 @@ #include <linux/module.h> #include <linux/interrupt.h> #include <asm/cacheflush.h> -#include <asm/mach/sysasic.h> -#include <asm/mach/dma.h> +#include <mach/sysasic.h> +#include <mach/dma.h> #include <asm/dma.h> struct g2_channel { diff --git a/arch/sh/drivers/dma/dma-pvr2.c b/arch/sh/drivers/dma/dma-pvr2.c index 838fad5..391cbe1 100644 --- a/arch/sh/drivers/dma/dma-pvr2.c +++ b/arch/sh/drivers/dma/dma-pvr2.c @@ -13,8 +13,8 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/interrupt.h> -#include <asm/mach/sysasic.h> -#include <asm/mach/dma.h> +#include <mach/sysasic.h> +#include <mach/dma.h> #include <asm/dma.h> #include <asm/io.h> diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c index 71ff3d6..bd30548 100644 --- a/arch/sh/drivers/dma/dma-sh.c +++ b/arch/sh/drivers/dma/dma-sh.c @@ -14,7 +14,7 @@ #include <linux/init.h> #include <linux/interrupt.h> #include <linux/module.h> -#include <asm/dreamcast/dma.h> +#include <mach/dma.h> #include <asm/dma.h> #include <asm/io.h> #include "dma-sh.h" diff --git a/arch/sh/drivers/dma/dma-sh.h b/arch/sh/drivers/dma/dma-sh.h index 0f591fb..b05af34 100644 --- a/arch/sh/drivers/dma/dma-sh.h +++ b/arch/sh/drivers/dma/dma-sh.h @@ -11,7 +11,7 @@ #ifndef __DMA_SH_H #define __DMA_SH_H -#include <asm/cpu/dma.h> +#include <cpu/dma.h> /* Definitions for the SuperH DMAC */ #define REQ_L 0x00000000 diff --git a/arch/sh/drivers/pci/fixups-dreamcast.c b/arch/sh/drivers/pci/fixups-dreamcast.c index c446993..2bf85cf 100644 --- a/arch/sh/drivers/pci/fixups-dreamcast.c +++ b/arch/sh/drivers/pci/fixups-dreamcast.c @@ -26,7 +26,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/mach/pci.h> +#include <mach/pci.h> static void __init gapspci_fixup_resources(struct pci_dev *dev) { diff --git a/arch/sh/drivers/pci/ops-cayman.c b/arch/sh/drivers/pci/ops-cayman.c index 980275f..5ccf9ea 100644 --- a/arch/sh/drivers/pci/ops-cayman.c +++ b/arch/sh/drivers/pci/ops-cayman.c @@ -2,7 +2,7 @@ #include <linux/init.h> #include <linux/pci.h> #include <linux/types.h> -#include <asm/cpu/irq.h> +#include <cpu/irq.h> #include "pci-sh5.h" static inline u8 bridge_swizzle(u8 pin, u8 slot) diff --git a/arch/sh/drivers/pci/ops-dreamcast.c b/arch/sh/drivers/pci/ops-dreamcast.c index f54c291..f5d2a2a 100644 --- a/arch/sh/drivers/pci/ops-dreamcast.c +++ b/arch/sh/drivers/pci/ops-dreamcast.c @@ -26,7 +26,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/mach/pci.h> +#include <mach/pci.h> static struct resource gapspci_io_resource = { .name = "GAPSPCI IO", diff --git a/arch/sh/drivers/pci/pci-sh5.c b/arch/sh/drivers/pci/pci-sh5.c index a00a4df..7a97438 100644 --- a/arch/sh/drivers/pci/pci-sh5.c +++ b/arch/sh/drivers/pci/pci-sh5.c @@ -19,7 +19,7 @@ #include <linux/delay.h> #include <linux/types.h> #include <linux/irq.h> -#include <asm/cpu/irq.h> +#include <cpu/irq.h> #include <asm/pci.h> #include <asm/io.h> #include "pci-sh5.h" diff --git a/include/asm-sh/.gitignore b/arch/sh/include/asm/.gitignore index 9218ef8..378db77 100644 --- a/include/asm-sh/.gitignore +++ b/arch/sh/include/asm/.gitignore @@ -1,3 +1 @@ -cpu -mach machtypes.h diff --git a/include/asm-sh/Kbuild b/arch/sh/include/asm/Kbuild index 43910cd..43910cd 100644 --- a/include/asm-sh/Kbuild +++ b/arch/sh/include/asm/Kbuild diff --git a/include/asm-sh/a.out.h b/arch/sh/include/asm/a.out.h index 1f93130..1f93130 100644 --- a/include/asm-sh/a.out.h +++ b/arch/sh/include/asm/a.out.h diff --git a/include/asm-sh/adc.h b/arch/sh/include/asm/adc.h index 5f85cf7..48824c1 100644 --- a/include/asm-sh/adc.h +++ b/arch/sh/include/asm/adc.h @@ -5,7 +5,7 @@ * Copyright (C) 2004 Andriy Skulysh */ -#include <asm/cpu/adc.h> +#include <cpu/adc.h> int adc_single(unsigned int channel); diff --git a/include/asm-sh/addrspace.h b/arch/sh/include/asm/addrspace.h index fa544fc..2702d81 100644 --- a/include/asm-sh/addrspace.h +++ b/arch/sh/include/asm/addrspace.h @@ -12,7 +12,7 @@ #ifdef __KERNEL__ -#include <asm/cpu/addrspace.h> +#include <cpu/addrspace.h> /* If this CPU supports segmentation, hook up the helpers */ #ifdef P1SEG diff --git a/include/asm-sh/atomic-grb.h b/arch/sh/include/asm/atomic-grb.h index 4c5b7db..4c5b7db 100644 --- a/include/asm-sh/atomic-grb.h +++ b/arch/sh/include/asm/atomic-grb.h diff --git a/include/asm-sh/atomic-irq.h b/arch/sh/include/asm/atomic-irq.h index 74f7943..74f7943 100644 --- a/include/asm-sh/atomic-irq.h +++ b/arch/sh/include/asm/atomic-irq.h diff --git a/include/asm-sh/atomic-llsc.h b/arch/sh/include/asm/atomic-llsc.h index 4b00b78..4b00b78 100644 --- a/include/asm-sh/atomic-llsc.h +++ b/arch/sh/include/asm/atomic-llsc.h diff --git a/include/asm-sh/atomic.h b/arch/sh/include/asm/atomic.h index c043ef0..c043ef0 100644 --- a/include/asm-sh/atomic.h +++ b/arch/sh/include/asm/atomic.h diff --git a/include/asm-sh/auxvec.h b/arch/sh/include/asm/auxvec.h index a6b9d4f..a6b9d4f 100644 --- a/include/asm-sh/auxvec.h +++ b/arch/sh/include/asm/auxvec.h diff --git a/include/asm-sh/bitops-grb.h b/arch/sh/include/asm/bitops-grb.h index a5907b9..a5907b9 100644 --- a/include/asm-sh/bitops-grb.h +++ b/arch/sh/include/asm/bitops-grb.h diff --git a/include/asm-sh/bitops-irq.h b/arch/sh/include/asm/bitops-irq.h index 653a127..653a127 100644 --- a/include/asm-sh/bitops-irq.h +++ b/arch/sh/include/asm/bitops-irq.h diff --git a/include/asm-sh/bitops.h b/arch/sh/include/asm/bitops.h index d7d382f..d7d382f 100644 --- a/include/asm-sh/bitops.h +++ b/arch/sh/include/asm/bitops.h diff --git a/include/asm-sh/bug.h b/arch/sh/include/asm/bug.h index c017180..c017180 100644 --- a/include/asm-sh/bug.h +++ b/arch/sh/include/asm/bug.h diff --git a/include/asm-sh/bugs.h b/arch/sh/include/asm/bugs.h index 121b2ec..121b2ec 100644 --- a/include/asm-sh/bugs.h +++ b/arch/sh/include/asm/bugs.h diff --git a/include/asm-sh/byteorder.h b/arch/sh/include/asm/byteorder.h index 4c13e61..4c13e61 100644 --- a/include/asm-sh/byteorder.h +++ b/arch/sh/include/asm/byteorder.h diff --git a/include/asm-sh/cache.h b/arch/sh/include/asm/cache.h index 083419f..02df18e 100644 --- a/include/asm-sh/cache.h +++ b/arch/sh/include/asm/cache.h @@ -10,7 +10,7 @@ #ifdef __KERNEL__ #include <linux/init.h> -#include <asm/cpu/cache.h> +#include <cpu/cache.h> #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) diff --git a/include/asm-sh/cacheflush.h b/arch/sh/include/asm/cacheflush.h index e034c36..09acbc3 100644 --- a/include/asm-sh/cacheflush.h +++ b/arch/sh/include/asm/cacheflush.h @@ -27,7 +27,7 @@ #define __flush_purge_region(start, size) do { (void)(start); } while (0) #define __flush_invalidate_region(start, size) do { (void)(start); } while (0) #else -#include <asm/cpu/cacheflush.h> +#include <cpu/cacheflush.h> /* * Consistent DMA requires that the __flush_xxx() primitives must be set diff --git a/include/asm-sh/checksum.h b/arch/sh/include/asm/checksum.h index 67496ab..67496ab 100644 --- a/include/asm-sh/checksum.h +++ b/arch/sh/include/asm/checksum.h diff --git a/include/asm-sh/checksum_32.h b/arch/sh/include/asm/checksum_32.h index 14b7ac2..14b7ac2 100644 --- a/include/asm-sh/checksum_32.h +++ b/arch/sh/include/asm/checksum_32.h diff --git a/include/asm-sh/checksum_64.h b/arch/sh/include/asm/checksum_64.h index 9c62a03..9c62a03 100644 --- a/include/asm-sh/checksum_64.h +++ b/arch/sh/include/asm/checksum_64.h diff --git a/include/asm-sh/clock.h b/arch/sh/include/asm/clock.h index 720dfab..720dfab 100644 --- a/include/asm-sh/clock.h +++ b/arch/sh/include/asm/clock.h diff --git a/include/asm-sh/cmpxchg-grb.h b/arch/sh/include/asm/cmpxchg-grb.h index e2681ab..e2681ab 100644 --- a/include/asm-sh/cmpxchg-grb.h +++ b/arch/sh/include/asm/cmpxchg-grb.h diff --git a/include/asm-sh/cmpxchg-irq.h b/arch/sh/include/asm/cmpxchg-irq.h index 43049ec..43049ec 100644 --- a/include/asm-sh/cmpxchg-irq.h +++ b/arch/sh/include/asm/cmpxchg-irq.h diff --git a/include/asm-sh/cpu-features.h b/arch/sh/include/asm/cpu-features.h index 86308aa..86308aa 100644 --- a/include/asm-sh/cpu-features.h +++ b/arch/sh/include/asm/cpu-features.h diff --git a/include/asm-sh/cputime.h b/arch/sh/include/asm/cputime.h index 6ca395d..6ca395d 100644 --- a/include/asm-sh/cputime.h +++ b/arch/sh/include/asm/cputime.h diff --git a/include/asm-sh/current.h b/arch/sh/include/asm/current.h index 62b6388..62b6388 100644 --- a/include/asm-sh/current.h +++ b/arch/sh/include/asm/current.h diff --git a/include/asm-sh/delay.h b/arch/sh/include/asm/delay.h index 4b16bf9..4b16bf9 100644 --- a/include/asm-sh/delay.h +++ b/arch/sh/include/asm/delay.h diff --git a/include/asm-sh/device.h b/arch/sh/include/asm/device.h index efd511d..efd511d 100644 --- a/include/asm-sh/device.h +++ b/arch/sh/include/asm/device.h diff --git a/include/asm-sh/div64.h b/arch/sh/include/asm/div64.h index 6cd978c..6cd978c 100644 --- a/include/asm-sh/div64.h +++ b/arch/sh/include/asm/div64.h diff --git a/include/asm-sh/dma-mapping.h b/arch/sh/include/asm/dma-mapping.h index 6c0b8a2..6c0b8a2 100644 --- a/include/asm-sh/dma-mapping.h +++ b/arch/sh/include/asm/dma-mapping.h diff --git a/include/asm-sh/dma.h b/arch/sh/include/asm/dma.h index a65b02f..beca712 100644 --- a/include/asm-sh/dma.h +++ b/arch/sh/include/asm/dma.h @@ -15,7 +15,7 @@ #include <linux/wait.h> #include <linux/sched.h> #include <linux/sysdev.h> -#include <asm/cpu/dma.h> +#include <cpu/dma.h> /* The maximum address that we can perform a DMA transfer to on this platform */ /* Don't define MAX_DMA_ADDRESS; it's useless on the SuperH and any diff --git a/include/asm-sh/dmabrg.h b/arch/sh/include/asm/dmabrg.h index c5edba2..c5edba2 100644 --- a/include/asm-sh/dmabrg.h +++ b/arch/sh/include/asm/dmabrg.h diff --git a/include/asm-sh/edosk7705.h b/arch/sh/include/asm/edosk7705.h index 5bdc9d9..5bdc9d9 100644 --- a/include/asm-sh/edosk7705.h +++ b/arch/sh/include/asm/edosk7705.h diff --git a/include/asm-sh/elf.h b/arch/sh/include/asm/elf.h index f01449a..f01449a 100644 --- a/include/asm-sh/elf.h +++ b/arch/sh/include/asm/elf.h diff --git a/include/asm-sh/emergency-restart.h b/arch/sh/include/asm/emergency-restart.h index 108d8c4..108d8c4 100644 --- a/include/asm-sh/emergency-restart.h +++ b/arch/sh/include/asm/emergency-restart.h diff --git a/include/asm-sh/entry-macros.S b/arch/sh/include/asm/entry-macros.S index 2dab0b8..2dab0b8 100644 --- a/include/asm-sh/entry-macros.S +++ b/arch/sh/include/asm/entry-macros.S diff --git a/include/asm-sh/errno.h b/arch/sh/include/asm/errno.h index 51cf6f9..51cf6f9 100644 --- a/include/asm-sh/errno.h +++ b/arch/sh/include/asm/errno.h diff --git a/include/asm-sh/fb.h b/arch/sh/include/asm/fb.h index d92e99c..d92e99c 100644 --- a/include/asm-sh/fb.h +++ b/arch/sh/include/asm/fb.h diff --git a/include/asm-sh/fcntl.h b/arch/sh/include/asm/fcntl.h index 46ab12d..46ab12d 100644 --- a/include/asm-sh/fcntl.h +++ b/arch/sh/include/asm/fcntl.h diff --git a/include/asm-sh/fixmap.h b/arch/sh/include/asm/fixmap.h index 721fcc4..721fcc4 100644 --- a/include/asm-sh/fixmap.h +++ b/arch/sh/include/asm/fixmap.h diff --git a/include/asm-sh/flat.h b/arch/sh/include/asm/flat.h index 0cc8002..0cc8002 100644 --- a/include/asm-sh/flat.h +++ b/arch/sh/include/asm/flat.h diff --git a/include/asm-sh/fpu.h b/arch/sh/include/asm/fpu.h index 91462fe..91462fe 100644 --- a/include/asm-sh/fpu.h +++ b/arch/sh/include/asm/fpu.h diff --git a/include/asm-sh/freq.h b/arch/sh/include/asm/freq.h index 39c0e09..4ece90b 100644 --- a/include/asm-sh/freq.h +++ b/arch/sh/include/asm/freq.h @@ -12,7 +12,7 @@ #define __ASM_SH_FREQ_H #ifdef __KERNEL__ -#include <asm/cpu/freq.h> +#include <cpu/freq.h> #endif /* __KERNEL__ */ #endif /* __ASM_SH_FREQ_H */ diff --git a/include/asm-sh/futex-irq.h b/arch/sh/include/asm/futex-irq.h index a9f16a7..a9f16a7 100644 --- a/include/asm-sh/futex-irq.h +++ b/arch/sh/include/asm/futex-irq.h diff --git a/include/asm-sh/futex.h b/arch/sh/include/asm/futex.h index 68256ec..68256ec 100644 --- a/include/asm-sh/futex.h +++ b/arch/sh/include/asm/futex.h diff --git a/include/asm-sh/gpio.h b/arch/sh/include/asm/gpio.h index 9bb27e0..cf32bd2 100644 --- a/include/asm-sh/gpio.h +++ b/arch/sh/include/asm/gpio.h @@ -13,7 +13,7 @@ #define __ASM_SH_GPIO_H #if defined(CONFIG_CPU_SH3) -#include <asm/cpu/gpio.h> +#include <cpu/gpio.h> #endif #endif /* __ASM_SH_GPIO_H */ diff --git a/include/asm-sh/hardirq.h b/arch/sh/include/asm/hardirq.h index 715ee23..715ee23 100644 --- a/include/asm-sh/hardirq.h +++ b/arch/sh/include/asm/hardirq.h diff --git a/include/asm-sh/hd64461.h b/arch/sh/include/asm/hd64461.h index 8c1353b..8c1353b 100644 --- a/include/asm-sh/hd64461.h +++ b/arch/sh/include/asm/hd64461.h diff --git a/include/asm-sh/hd64465/gpio.h b/arch/sh/include/asm/hd64465/gpio.h index a3cdca2..a3cdca2 100644 --- a/include/asm-sh/hd64465/gpio.h +++ b/arch/sh/include/asm/hd64465/gpio.h diff --git a/include/asm-sh/hd64465/hd64465.h b/arch/sh/include/asm/hd64465/hd64465.h index cfd0e80..cfd0e80 100644 --- a/include/asm-sh/hd64465/hd64465.h +++ b/arch/sh/include/asm/hd64465/hd64465.h diff --git a/include/asm-sh/hd64465/io.h b/arch/sh/include/asm/hd64465/io.h index 139f147..139f147 100644 --- a/include/asm-sh/hd64465/io.h +++ b/arch/sh/include/asm/hd64465/io.h diff --git a/include/asm-sh/heartbeat.h b/arch/sh/include/asm/heartbeat.h index 724a43e..724a43e 100644 --- a/include/asm-sh/heartbeat.h +++ b/arch/sh/include/asm/heartbeat.h diff --git a/include/asm-sh/hp6xx.h b/arch/sh/include/asm/hp6xx.h index 0d4165a..0d4165a 100644 --- a/include/asm-sh/hp6xx.h +++ b/arch/sh/include/asm/hp6xx.h diff --git a/include/asm-sh/hugetlb.h b/arch/sh/include/asm/hugetlb.h index 967068f..967068f 100644 --- a/include/asm-sh/hugetlb.h +++ b/arch/sh/include/asm/hugetlb.h diff --git a/include/asm-sh/hw_irq.h b/arch/sh/include/asm/hw_irq.h index d557b00..d557b00 100644 --- a/include/asm-sh/hw_irq.h +++ b/arch/sh/include/asm/hw_irq.h diff --git a/include/asm-sh/i2c-sh7760.h b/arch/sh/include/asm/i2c-sh7760.h index 2418211..2418211 100644 --- a/include/asm-sh/i2c-sh7760.h +++ b/arch/sh/include/asm/i2c-sh7760.h diff --git a/include/asm-sh/ilsel.h b/arch/sh/include/asm/ilsel.h index e3d304b..e3d304b 100644 --- a/include/asm-sh/ilsel.h +++ b/arch/sh/include/asm/ilsel.h diff --git a/include/asm-sh/io.h b/arch/sh/include/asm/io.h index a4fbf0c..a4fbf0c 100644 --- a/include/asm-sh/io.h +++ b/arch/sh/include/asm/io.h diff --git a/include/asm-sh/io_generic.h b/arch/sh/include/asm/io_generic.h index 92fc607..92fc607 100644 --- a/include/asm-sh/io_generic.h +++ b/arch/sh/include/asm/io_generic.h diff --git a/include/asm-sh/io_trapped.h b/arch/sh/include/asm/io_trapped.h index f1251d4..f1251d4 100644 --- a/include/asm-sh/io_trapped.h +++ b/arch/sh/include/asm/io_trapped.h diff --git a/include/asm-sh/ioctl.h b/arch/sh/include/asm/ioctl.h index b279fe0..b279fe0 100644 --- a/include/asm-sh/ioctl.h +++ b/arch/sh/include/asm/ioctl.h diff --git a/include/asm-sh/ioctls.h b/arch/sh/include/asm/ioctls.h index c212c37..c212c37 100644 --- a/include/asm-sh/ioctls.h +++ b/arch/sh/include/asm/ioctls.h diff --git a/include/asm-sh/ipcbuf.h b/arch/sh/include/asm/ipcbuf.h index 5ffc997..5ffc997 100644 --- a/include/asm-sh/ipcbuf.h +++ b/arch/sh/include/asm/ipcbuf.h diff --git a/include/asm-sh/irq.h b/arch/sh/include/asm/irq.h index ca66e5d..6195a53 100644 --- a/include/asm-sh/irq.h +++ b/arch/sh/include/asm/irq.h @@ -51,7 +51,7 @@ extern void irq_ctx_exit(int cpu); #endif #ifdef CONFIG_CPU_SH5 -#include <asm/cpu/irq.h> +#include <cpu/irq.h> #endif #endif /* __ASM_SH_IRQ_H */ diff --git a/include/asm-sh/irq_regs.h b/arch/sh/include/asm/irq_regs.h index 3dd9c0b..3dd9c0b 100644 --- a/include/asm-sh/irq_regs.h +++ b/arch/sh/include/asm/irq_regs.h diff --git a/include/asm-sh/irqflags.h b/arch/sh/include/asm/irqflags.h index 46e71da..46e71da 100644 --- a/include/asm-sh/irqflags.h +++ b/arch/sh/include/asm/irqflags.h diff --git a/include/asm-sh/irqflags_32.h b/arch/sh/include/asm/irqflags_32.h index 60218f5..60218f5 100644 --- a/include/asm-sh/irqflags_32.h +++ b/arch/sh/include/asm/irqflags_32.h diff --git a/include/asm-sh/irqflags_64.h b/arch/sh/include/asm/irqflags_64.h index 4f6b8a5..88f6522 100644 --- a/include/asm-sh/irqflags_64.h +++ b/arch/sh/include/asm/irqflags_64.h @@ -1,7 +1,7 @@ #ifndef __ASM_SH_IRQFLAGS_64_H #define __ASM_SH_IRQFLAGS_64_H -#include <asm/cpu/registers.h> +#include <cpu/registers.h> #define SR_MASK_LL 0x00000000000000f0LL #define SR_BL_LL 0x0000000010000000LL diff --git a/include/asm-sh/kdebug.h b/arch/sh/include/asm/kdebug.h index 49cd690..49cd690 100644 --- a/include/asm-sh/kdebug.h +++ b/arch/sh/include/asm/kdebug.h diff --git a/include/asm-sh/kexec.h b/arch/sh/include/asm/kexec.h index 00f4260..00f4260 100644 --- a/include/asm-sh/kexec.h +++ b/arch/sh/include/asm/kexec.h diff --git a/include/asm-sh/kgdb.h b/arch/sh/include/asm/kgdb.h index 24e4207..24e4207 100644 --- a/include/asm-sh/kgdb.h +++ b/arch/sh/include/asm/kgdb.h diff --git a/include/asm-sh/kmap_types.h b/arch/sh/include/asm/kmap_types.h index 84d565c..84d565c 100644 --- a/include/asm-sh/kmap_types.h +++ b/arch/sh/include/asm/kmap_types.h diff --git a/include/asm-sh/lboxre2.h b/arch/sh/include/asm/lboxre2.h index e6d1605..e6d1605 100644 --- a/include/asm-sh/lboxre2.h +++ b/arch/sh/include/asm/lboxre2.h diff --git a/include/asm-sh/linkage.h b/arch/sh/include/asm/linkage.h index 3565a4f..3565a4f 100644 --- a/include/asm-sh/linkage.h +++ b/arch/sh/include/asm/linkage.h diff --git a/include/asm-sh/local.h b/arch/sh/include/asm/local.h index 9ed9b9c..9ed9b9c 100644 --- a/include/asm-sh/local.h +++ b/arch/sh/include/asm/local.h diff --git a/include/asm-sh/machvec.h b/arch/sh/include/asm/machvec.h index b2e4124..b2e4124 100644 --- a/include/asm-sh/machvec.h +++ b/arch/sh/include/asm/machvec.h diff --git a/include/asm-sh/magicpanelr2.h b/arch/sh/include/asm/magicpanelr2.h index c644a77..c644a77 100644 --- a/include/asm-sh/magicpanelr2.h +++ b/arch/sh/include/asm/magicpanelr2.h diff --git a/include/asm-sh/mc146818rtc.h b/arch/sh/include/asm/mc146818rtc.h index 0aee96a..0aee96a 100644 --- a/include/asm-sh/mc146818rtc.h +++ b/arch/sh/include/asm/mc146818rtc.h diff --git a/include/asm-sh/microdev.h b/arch/sh/include/asm/microdev.h index 1aed158..1aed158 100644 --- a/include/asm-sh/microdev.h +++ b/arch/sh/include/asm/microdev.h diff --git a/include/asm-sh/migor.h b/arch/sh/include/asm/migor.h index 10016e0..10016e0 100644 --- a/include/asm-sh/migor.h +++ b/arch/sh/include/asm/migor.h diff --git a/include/asm-sh/mman.h b/arch/sh/include/asm/mman.h index 156eb02..156eb02 100644 --- a/include/asm-sh/mman.h +++ b/arch/sh/include/asm/mman.h diff --git a/include/asm-sh/mmu.h b/arch/sh/include/asm/mmu.h index fdcb93b..fdcb93b 100644 --- a/include/asm-sh/mmu.h +++ b/arch/sh/include/asm/mmu.h diff --git a/include/asm-sh/mmu_context.h b/arch/sh/include/asm/mmu_context.h index 8589a50..04c0c97 100644 --- a/include/asm-sh/mmu_context.h +++ b/arch/sh/include/asm/mmu_context.h @@ -8,7 +8,7 @@ #define __ASM_SH_MMU_CONTEXT_H #ifdef __KERNEL__ -#include <asm/cpu/mmu_context.h> +#include <cpu/mmu_context.h> #include <asm/tlbflush.h> #include <asm/uaccess.h> #include <asm/io.h> diff --git a/include/asm-sh/mmu_context_32.h b/arch/sh/include/asm/mmu_context_32.h index f4f9aeb..f4f9aeb 100644 --- a/include/asm-sh/mmu_context_32.h +++ b/arch/sh/include/asm/mmu_context_32.h diff --git a/include/asm-sh/mmu_context_64.h b/arch/sh/include/asm/mmu_context_64.h index 9649f1c..de12102 100644 --- a/include/asm-sh/mmu_context_64.h +++ b/arch/sh/include/asm/mmu_context_64.h @@ -11,7 +11,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. */ -#include <asm/cpu/registers.h> +#include <cpu/registers.h> #include <asm/cacheflush.h> #define SR_ASID_MASK 0xffffffffff00ffffULL diff --git a/include/asm-sh/mmzone.h b/arch/sh/include/asm/mmzone.h index 2969253..2969253 100644 --- a/include/asm-sh/mmzone.h +++ b/arch/sh/include/asm/mmzone.h diff --git a/include/asm-sh/module.h b/arch/sh/include/asm/module.h index 46eccd3..46eccd3 100644 --- a/include/asm-sh/module.h +++ b/arch/sh/include/asm/module.h diff --git a/include/asm-sh/msgbuf.h b/arch/sh/include/asm/msgbuf.h index 5174323..5174323 100644 --- a/include/asm-sh/msgbuf.h +++ b/arch/sh/include/asm/msgbuf.h diff --git a/include/asm-sh/mutex.h b/arch/sh/include/asm/mutex.h index 458c1f7..458c1f7 100644 --- a/include/asm-sh/mutex.h +++ b/arch/sh/include/asm/mutex.h diff --git a/include/asm-sh/page.h b/arch/sh/include/asm/page.h index 77fb8bf..77fb8bf 100644 --- a/include/asm-sh/page.h +++ b/arch/sh/include/asm/page.h diff --git a/include/asm-sh/param.h b/arch/sh/include/asm/param.h index ae245af..ae245af 100644 --- a/include/asm-sh/param.h +++ b/arch/sh/include/asm/param.h diff --git a/include/asm-sh/parport.h b/arch/sh/include/asm/parport.h index f67ba60..f67ba60 100644 --- a/include/asm-sh/parport.h +++ b/arch/sh/include/asm/parport.h diff --git a/include/asm-sh/pci.h b/arch/sh/include/asm/pci.h index df1d383..df1d383 100644 --- a/include/asm-sh/pci.h +++ b/arch/sh/include/asm/pci.h diff --git a/include/asm-sh/percpu.h b/arch/sh/include/asm/percpu.h index 4db4b39..4db4b39 100644 --- a/include/asm-sh/percpu.h +++ b/arch/sh/include/asm/percpu.h diff --git a/include/asm-sh/pgalloc.h b/arch/sh/include/asm/pgalloc.h index 84dd2db..84dd2db 100644 --- a/include/asm-sh/pgalloc.h +++ b/arch/sh/include/asm/pgalloc.h diff --git a/include/asm-sh/pgtable.h b/arch/sh/include/asm/pgtable.h index a4a8f8b..a4a8f8b 100644 --- a/include/asm-sh/pgtable.h +++ b/arch/sh/include/asm/pgtable.h diff --git a/include/asm-sh/pgtable_32.h b/arch/sh/include/asm/pgtable_32.h index 72ea209..72ea209 100644 --- a/include/asm-sh/pgtable_32.h +++ b/arch/sh/include/asm/pgtable_32.h diff --git a/include/asm-sh/pgtable_64.h b/arch/sh/include/asm/pgtable_64.h index c78990c..c78990c 100644 --- a/include/asm-sh/pgtable_64.h +++ b/arch/sh/include/asm/pgtable_64.h diff --git a/include/asm-sh/pm.h b/arch/sh/include/asm/pm.h index 56fdbd6..56fdbd6 100644 --- a/include/asm-sh/pm.h +++ b/arch/sh/include/asm/pm.h diff --git a/include/asm-sh/poll.h b/arch/sh/include/asm/poll.h index c98509d..c98509d 100644 --- a/include/asm-sh/poll.h +++ b/arch/sh/include/asm/poll.h diff --git a/include/asm-sh/posix_types.h b/arch/sh/include/asm/posix_types.h index 4eeb723..4eeb723 100644 --- a/include/asm-sh/posix_types.h +++ b/arch/sh/include/asm/posix_types.h diff --git a/include/asm-sh/posix_types_32.h b/arch/sh/include/asm/posix_types_32.h index 0a3d2f5..0a3d2f5 100644 --- a/include/asm-sh/posix_types_32.h +++ b/arch/sh/include/asm/posix_types_32.h diff --git a/include/asm-sh/posix_types_64.h b/arch/sh/include/asm/posix_types_64.h index 0620317..0620317 100644 --- a/include/asm-sh/posix_types_64.h +++ b/arch/sh/include/asm/posix_types_64.h diff --git a/include/asm-sh/processor.h b/arch/sh/include/asm/processor.h index 15d9f92..15d9f92 100644 --- a/include/asm-sh/processor.h +++ b/arch/sh/include/asm/processor.h diff --git a/include/asm-sh/processor_32.h b/arch/sh/include/asm/processor_32.h index 0dadd75..0dadd75 100644 --- a/include/asm-sh/processor_32.h +++ b/arch/sh/include/asm/processor_32.h diff --git a/include/asm-sh/processor_64.h b/arch/sh/include/asm/processor_64.h index fc7fc68..770d516 100644 --- a/include/asm-sh/processor_64.h +++ b/arch/sh/include/asm/processor_64.h @@ -19,7 +19,7 @@ #include <asm/types.h> #include <asm/cache.h> #include <asm/ptrace.h> -#include <asm/cpu/registers.h> +#include <cpu/registers.h> /* * Default implementation of macro that returns current diff --git a/include/asm-sh/ptrace.h b/arch/sh/include/asm/ptrace.h index 643ab5a..643ab5a 100644 --- a/include/asm-sh/ptrace.h +++ b/arch/sh/include/asm/ptrace.h diff --git a/include/asm-sh/push-switch.h b/arch/sh/include/asm/push-switch.h index 4903f9e..4903f9e 100644 --- a/include/asm-sh/push-switch.h +++ b/arch/sh/include/asm/push-switch.h diff --git a/include/asm-sh/r7780rp.h b/arch/sh/include/asm/r7780rp.h index 306f735..306f735 100644 --- a/include/asm-sh/r7780rp.h +++ b/arch/sh/include/asm/r7780rp.h diff --git a/include/asm-sh/resource.h b/arch/sh/include/asm/resource.h index 9c2499a..9c2499a 100644 --- a/include/asm-sh/resource.h +++ b/arch/sh/include/asm/resource.h diff --git a/include/asm-sh/rtc.h b/arch/sh/include/asm/rtc.h index ec45ba8..1813f42 100644 --- a/include/asm-sh/rtc.h +++ b/arch/sh/include/asm/rtc.h @@ -11,6 +11,6 @@ struct sh_rtc_platform_info { unsigned long capabilities; }; -#include <asm/cpu/rtc.h> +#include <cpu/rtc.h> #endif /* _ASM_RTC_H */ diff --git a/include/asm-sh/rts7751r2d.h b/arch/sh/include/asm/rts7751r2d.h index 0a80015..0a80015 100644 --- a/include/asm-sh/rts7751r2d.h +++ b/arch/sh/include/asm/rts7751r2d.h diff --git a/include/asm-sh/rwsem.h b/arch/sh/include/asm/rwsem.h index 1987f3e..1987f3e 100644 --- a/include/asm-sh/rwsem.h +++ b/arch/sh/include/asm/rwsem.h diff --git a/include/asm-sh/scatterlist.h b/arch/sh/include/asm/scatterlist.h index 2084d03..2084d03 100644 --- a/include/asm-sh/scatterlist.h +++ b/arch/sh/include/asm/scatterlist.h diff --git a/include/asm-sh/sdk7780.h b/arch/sh/include/asm/sdk7780.h index 697dc86..697dc86 100644 --- a/include/asm-sh/sdk7780.h +++ b/arch/sh/include/asm/sdk7780.h diff --git a/include/asm-sh/se.h b/arch/sh/include/asm/se.h index eb23000..eb23000 100644 --- a/include/asm-sh/se.h +++ b/arch/sh/include/asm/se.h diff --git a/include/asm-sh/se7206.h b/arch/sh/include/asm/se7206.h index 698eb80..698eb80 100644 --- a/include/asm-sh/se7206.h +++ b/arch/sh/include/asm/se7206.h diff --git a/include/asm-sh/se7343.h b/arch/sh/include/asm/se7343.h index 9845846..9845846 100644 --- a/include/asm-sh/se7343.h +++ b/arch/sh/include/asm/se7343.h diff --git a/include/asm-sh/se7721.h b/arch/sh/include/asm/se7721.h index b957f60..b957f60 100644 --- a/include/asm-sh/se7721.h +++ b/arch/sh/include/asm/se7721.h diff --git a/include/asm-sh/se7722.h b/arch/sh/include/asm/se7722.h index e971d9a..e971d9a 100644 --- a/include/asm-sh/se7722.h +++ b/arch/sh/include/asm/se7722.h diff --git a/include/asm-sh/se7751.h b/arch/sh/include/asm/se7751.h index b36792a..b36792a 100644 --- a/include/asm-sh/se7751.h +++ b/arch/sh/include/asm/se7751.h diff --git a/include/asm-sh/se7780.h b/arch/sh/include/asm/se7780.h index 40e9b41..40e9b41 100644 --- a/include/asm-sh/se7780.h +++ b/arch/sh/include/asm/se7780.h diff --git a/include/asm-sh/sections.h b/arch/sh/include/asm/sections.h index 8f8f4ad..8f8f4ad 100644 --- a/include/asm-sh/sections.h +++ b/arch/sh/include/asm/sections.h diff --git a/include/asm-sh/segment.h b/arch/sh/include/asm/segment.h index 5e2725f..5e2725f 100644 --- a/include/asm-sh/segment.h +++ b/arch/sh/include/asm/segment.h diff --git a/include/asm-sh/sembuf.h b/arch/sh/include/asm/sembuf.h index d79f3bd..d79f3bd 100644 --- a/include/asm-sh/sembuf.h +++ b/arch/sh/include/asm/sembuf.h diff --git a/include/asm-sh/serial.h b/arch/sh/include/asm/serial.h index 21f6d33..e13cc94 100644 --- a/include/asm-sh/serial.h +++ b/arch/sh/include/asm/serial.h @@ -21,7 +21,7 @@ #define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST) #ifdef CONFIG_HD64465 -#include <asm/hd64465.h> +#include <asm/hd64465/hd64465.h> #define SERIAL_PORT_DFNS \ /* UART CLK PORT IRQ FLAGS */ \ diff --git a/include/asm-sh/setup.h b/arch/sh/include/asm/setup.h index 55a2bd3..55a2bd3 100644 --- a/include/asm-sh/setup.h +++ b/arch/sh/include/asm/setup.h diff --git a/include/asm-sh/sfp-machine.h b/arch/sh/include/asm/sfp-machine.h index d3c5484..d3c5484 100644 --- a/include/asm-sh/sfp-machine.h +++ b/arch/sh/include/asm/sfp-machine.h diff --git a/include/asm-sh/sh7760fb.h b/arch/sh/include/asm/sh7760fb.h index 8767f61..8767f61 100644 --- a/include/asm-sh/sh7760fb.h +++ b/arch/sh/include/asm/sh7760fb.h diff --git a/include/asm-sh/sh7763rdp.h b/arch/sh/include/asm/sh7763rdp.h index 8750cc8..8750cc8 100644 --- a/include/asm-sh/sh7763rdp.h +++ b/arch/sh/include/asm/sh7763rdp.h diff --git a/include/asm-sh/sh7785lcr.h b/arch/sh/include/asm/sh7785lcr.h index 1ce27d5..1ce27d5 100644 --- a/include/asm-sh/sh7785lcr.h +++ b/arch/sh/include/asm/sh7785lcr.h diff --git a/include/asm-sh/sh_bios.h b/arch/sh/include/asm/sh_bios.h index 0ca2619..0ca2619 100644 --- a/include/asm-sh/sh_bios.h +++ b/arch/sh/include/asm/sh_bios.h diff --git a/include/asm-sh/sh_keysc.h b/arch/sh/include/asm/sh_keysc.h index b5a4dd5..b5a4dd5 100644 --- a/include/asm-sh/sh_keysc.h +++ b/arch/sh/include/asm/sh_keysc.h diff --git a/include/asm-sh/sh_mobile_lcdc.h b/arch/sh/include/asm/sh_mobile_lcdc.h index 27677727..27677727 100644 --- a/include/asm-sh/sh_mobile_lcdc.h +++ b/arch/sh/include/asm/sh_mobile_lcdc.h diff --git a/include/asm-sh/shmbuf.h b/arch/sh/include/asm/shmbuf.h index b2101f4..b2101f4 100644 --- a/include/asm-sh/shmbuf.h +++ b/arch/sh/include/asm/shmbuf.h diff --git a/include/asm-sh/shmin.h b/arch/sh/include/asm/shmin.h index 36ba138..36ba138 100644 --- a/include/asm-sh/shmin.h +++ b/arch/sh/include/asm/shmin.h diff --git a/include/asm-sh/shmparam.h b/arch/sh/include/asm/shmparam.h index ba1758d..ba1758d 100644 --- a/include/asm-sh/shmparam.h +++ b/arch/sh/include/asm/shmparam.h diff --git a/include/asm-sh/sigcontext.h b/arch/sh/include/asm/sigcontext.h index 8ce1435..8ce1435 100644 --- a/include/asm-sh/sigcontext.h +++ b/arch/sh/include/asm/sigcontext.h diff --git a/include/asm-sh/siginfo.h b/arch/sh/include/asm/siginfo.h index 813040e..813040e 100644 --- a/include/asm-sh/siginfo.h +++ b/arch/sh/include/asm/siginfo.h diff --git a/include/asm-sh/signal.h b/arch/sh/include/asm/signal.h index 5c5c1e8..5c5c1e8 100644 --- a/include/asm-sh/signal.h +++ b/arch/sh/include/asm/signal.h diff --git a/include/asm-sh/smc37c93x.h b/arch/sh/include/asm/smc37c93x.h index 585da2a..585da2a 100644 --- a/include/asm-sh/smc37c93x.h +++ b/arch/sh/include/asm/smc37c93x.h diff --git a/include/asm-sh/smp.h b/arch/sh/include/asm/smp.h index 593343c..593343c 100644 --- a/include/asm-sh/smp.h +++ b/arch/sh/include/asm/smp.h diff --git a/include/asm-sh/snapgear.h b/arch/sh/include/asm/snapgear.h index 042d95f..042d95f 100644 --- a/include/asm-sh/snapgear.h +++ b/arch/sh/include/asm/snapgear.h diff --git a/include/asm-sh/socket.h b/arch/sh/include/asm/socket.h index 6d4bf65..6d4bf65 100644 --- a/include/asm-sh/socket.h +++ b/arch/sh/include/asm/socket.h diff --git a/include/asm-sh/sockios.h b/arch/sh/include/asm/sockios.h index cf8b96b..cf8b96b 100644 --- a/include/asm-sh/sockios.h +++ b/arch/sh/include/asm/sockios.h diff --git a/include/asm-sh/sparsemem.h b/arch/sh/include/asm/sparsemem.h index 547a540..547a540 100644 --- a/include/asm-sh/sparsemem.h +++ b/arch/sh/include/asm/sparsemem.h diff --git a/include/asm-sh/spi.h b/arch/sh/include/asm/spi.h index e96f5b0..e96f5b0 100644 --- a/include/asm-sh/spi.h +++ b/arch/sh/include/asm/spi.h diff --git a/include/asm-sh/spinlock.h b/arch/sh/include/asm/spinlock.h index e793181..e793181 100644 --- a/include/asm-sh/spinlock.h +++ b/arch/sh/include/asm/spinlock.h diff --git a/include/asm-sh/spinlock_types.h b/arch/sh/include/asm/spinlock_types.h index b4d244e..b4d244e 100644 --- a/include/asm-sh/spinlock_types.h +++ b/arch/sh/include/asm/spinlock_types.h diff --git a/include/asm-sh/stat.h b/arch/sh/include/asm/stat.h index e1810cc..e1810cc 100644 --- a/include/asm-sh/stat.h +++ b/arch/sh/include/asm/stat.h diff --git a/include/asm-sh/statfs.h b/arch/sh/include/asm/statfs.h index 9202a02..9202a02 100644 --- a/include/asm-sh/statfs.h +++ b/arch/sh/include/asm/statfs.h diff --git a/include/asm-sh/string.h b/arch/sh/include/asm/string.h index 8c1ea21d..8c1ea21d 100644 --- a/include/asm-sh/string.h +++ b/arch/sh/include/asm/string.h diff --git a/include/asm-sh/string_32.h b/arch/sh/include/asm/string_32.h index 55f8db6..55f8db6 100644 --- a/include/asm-sh/string_32.h +++ b/arch/sh/include/asm/string_32.h diff --git a/include/asm-sh/string_64.h b/arch/sh/include/asm/string_64.h index aa1fef2..aa1fef2 100644 --- a/include/asm-sh/string_64.h +++ b/arch/sh/include/asm/string_64.h diff --git a/include/asm-sh/system.h b/arch/sh/include/asm/system.h index 056d68c..056d68c 100644 --- a/include/asm-sh/system.h +++ b/arch/sh/include/asm/system.h diff --git a/include/asm-sh/system_32.h b/arch/sh/include/asm/system_32.h index f11bcf0..f11bcf0 100644 --- a/include/asm-sh/system_32.h +++ b/arch/sh/include/asm/system_32.h diff --git a/include/asm-sh/system_64.h b/arch/sh/include/asm/system_64.h index 943acf5..943acf5 100644 --- a/include/asm-sh/system_64.h +++ b/arch/sh/include/asm/system_64.h diff --git a/include/asm-sh/systemh7751.h b/arch/sh/include/asm/systemh7751.h index 4161122..4161122 100644 --- a/include/asm-sh/systemh7751.h +++ b/arch/sh/include/asm/systemh7751.h diff --git a/include/asm-sh/termbits.h b/arch/sh/include/asm/termbits.h index 77db116..77db116 100644 --- a/include/asm-sh/termbits.h +++ b/arch/sh/include/asm/termbits.h diff --git a/include/asm-sh/termios.h b/arch/sh/include/asm/termios.h index 0a8c793..0a8c793 100644 --- a/include/asm-sh/termios.h +++ b/arch/sh/include/asm/termios.h diff --git a/include/asm-sh/thread_info.h b/arch/sh/include/asm/thread_info.h index eeb4c74..eeb4c74 100644 --- a/include/asm-sh/thread_info.h +++ b/arch/sh/include/asm/thread_info.h diff --git a/include/asm-sh/timer.h b/arch/sh/include/asm/timer.h index 327f7eb..a7ca3a1 100644 --- a/include/asm-sh/timer.h +++ b/arch/sh/include/asm/timer.h @@ -3,7 +3,7 @@ #include <linux/sysdev.h> #include <linux/clocksource.h> -#include <asm/cpu/timer.h> +#include <cpu/timer.h> struct sys_timer_ops { int (*init)(void); diff --git a/include/asm-sh/timex.h b/arch/sh/include/asm/timex.h index a873e24..a873e24 100644 --- a/include/asm-sh/timex.h +++ b/arch/sh/include/asm/timex.h diff --git a/include/asm-sh/titan.h b/arch/sh/include/asm/titan.h index 03f3583..03f3583 100644 --- a/include/asm-sh/titan.h +++ b/arch/sh/include/asm/titan.h diff --git a/include/asm-sh/tlb.h b/arch/sh/include/asm/tlb.h index 88ff1ae..88ff1ae 100644 --- a/include/asm-sh/tlb.h +++ b/arch/sh/include/asm/tlb.h diff --git a/include/asm-sh/tlb_64.h b/arch/sh/include/asm/tlb_64.h index 0a96f3a..0a96f3a 100644 --- a/include/asm-sh/tlb_64.h +++ b/arch/sh/include/asm/tlb_64.h diff --git a/include/asm-sh/tlbflush.h b/arch/sh/include/asm/tlbflush.h index e0ac972..e0ac972 100644 --- a/include/asm-sh/tlbflush.h +++ b/arch/sh/include/asm/tlbflush.h diff --git a/include/asm-sh/topology.h b/arch/sh/include/asm/topology.h index 95f0085..95f0085 100644 --- a/include/asm-sh/topology.h +++ b/arch/sh/include/asm/topology.h diff --git a/include/asm-sh/types.h b/arch/sh/include/asm/types.h index beea4e6..beea4e6 100644 --- a/include/asm-sh/types.h +++ b/arch/sh/include/asm/types.h diff --git a/include/asm-sh/uaccess.h b/arch/sh/include/asm/uaccess.h index 45c2c9b..45c2c9b 100644 --- a/include/asm-sh/uaccess.h +++ b/arch/sh/include/asm/uaccess.h diff --git a/include/asm-sh/uaccess_32.h b/arch/sh/include/asm/uaccess_32.h index 892fd6d..892fd6d 100644 --- a/include/asm-sh/uaccess_32.h +++ b/arch/sh/include/asm/uaccess_32.h diff --git a/include/asm-sh/uaccess_64.h b/arch/sh/include/asm/uaccess_64.h index 81b3d51..81b3d51 100644 --- a/include/asm-sh/uaccess_64.h +++ b/arch/sh/include/asm/uaccess_64.h diff --git a/include/asm-sh/ubc.h b/arch/sh/include/asm/ubc.h index 56f4e30..a7b9028 100644 --- a/include/asm-sh/ubc.h +++ b/arch/sh/include/asm/ubc.h @@ -12,7 +12,7 @@ #define __ASM_SH_UBC_H #ifdef __KERNEL__ -#include <asm/cpu/ubc.h> +#include <cpu/ubc.h> /* User Break Controller */ #if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709) diff --git a/include/asm-sh/ucontext.h b/arch/sh/include/asm/ucontext.h index 202ef1d..202ef1d 100644 --- a/include/asm-sh/ucontext.h +++ b/arch/sh/include/asm/ucontext.h diff --git a/include/asm-sh/unaligned.h b/arch/sh/include/asm/unaligned.h index c1641a0..c1641a0 100644 --- a/include/asm-sh/unaligned.h +++ b/arch/sh/include/asm/unaligned.h diff --git a/include/asm-sh/unistd.h b/arch/sh/include/asm/unistd.h index 65be656..65be656 100644 --- a/include/asm-sh/unistd.h +++ b/arch/sh/include/asm/unistd.h diff --git a/include/asm-sh/unistd_32.h b/arch/sh/include/asm/unistd_32.h index d52c000..d52c000 100644 --- a/include/asm-sh/unistd_32.h +++ b/arch/sh/include/asm/unistd_32.h diff --git a/include/asm-sh/unistd_64.h b/arch/sh/include/asm/unistd_64.h index 7c54e91..7c54e91 100644 --- a/include/asm-sh/unistd_64.h +++ b/arch/sh/include/asm/unistd_64.h diff --git a/include/asm-sh/user.h b/arch/sh/include/asm/user.h index 8fd3cf6..8fd3cf6 100644 --- a/include/asm-sh/user.h +++ b/arch/sh/include/asm/user.h diff --git a/include/asm-sh/vga.h b/arch/sh/include/asm/vga.h index 06a5de8..06a5de8 100644 --- a/include/asm-sh/vga.h +++ b/arch/sh/include/asm/vga.h diff --git a/include/asm-sh/watchdog.h b/arch/sh/include/asm/watchdog.h index d19ea62..f024fed 100644 --- a/include/asm-sh/watchdog.h +++ b/arch/sh/include/asm/watchdog.h @@ -13,11 +13,11 @@ #ifdef __KERNEL__ #include <linux/types.h> -#include <asm/cpu/watchdog.h> +#include <cpu/watchdog.h> #include <asm/io.h> /* - * See asm/cpu-sh2/watchdog.h for explanation of this stupidity.. + * See cpu-sh2/watchdog.h for explanation of this stupidity.. */ #ifndef WTCNT_R # define WTCNT_R WTCNT diff --git a/include/asm-sh/xor.h b/arch/sh/include/asm/xor.h index c82eb12..c82eb12 100644 --- a/include/asm-sh/xor.h +++ b/arch/sh/include/asm/xor.h diff --git a/include/asm-sh/cpu-sh2/addrspace.h b/arch/sh/include/cpu-sh2/cpu/addrspace.h index 2b9ab93..2b9ab93 100644 --- a/include/asm-sh/cpu-sh2/addrspace.h +++ b/arch/sh/include/cpu-sh2/cpu/addrspace.h diff --git a/include/asm-sh/cpu-sh2/cache.h b/arch/sh/include/cpu-sh2/cpu/cache.h index 4e0b165..4e0b165 100644 --- a/include/asm-sh/cpu-sh2/cache.h +++ b/arch/sh/include/cpu-sh2/cpu/cache.h diff --git a/include/asm-sh/cpu-sh2/cacheflush.h b/arch/sh/include/cpu-sh2/cpu/cacheflush.h index 2979efb..2979efb 100644 --- a/include/asm-sh/cpu-sh2/cacheflush.h +++ b/arch/sh/include/cpu-sh2/cpu/cacheflush.h diff --git a/include/asm-sh/cpu-sh2/dma.h b/arch/sh/include/cpu-sh2/cpu/dma.h index d66b43c..d66b43c 100644 --- a/include/asm-sh/cpu-sh2/dma.h +++ b/arch/sh/include/cpu-sh2/cpu/dma.h diff --git a/include/asm-sh/cpu-sh2/freq.h b/arch/sh/include/cpu-sh2/cpu/freq.h index 31de475..31de475 100644 --- a/include/asm-sh/cpu-sh2/freq.h +++ b/arch/sh/include/cpu-sh2/cpu/freq.h diff --git a/include/asm-sh/cpu-sh2/mmu_context.h b/arch/sh/include/cpu-sh2/cpu/mmu_context.h index beeb299..beeb299 100644 --- a/include/asm-sh/cpu-sh2/mmu_context.h +++ b/arch/sh/include/cpu-sh2/cpu/mmu_context.h diff --git a/include/asm-sh/cpu-sh2/rtc.h b/arch/sh/include/cpu-sh2/cpu/rtc.h index 39e2d6e..39e2d6e 100644 --- a/include/asm-sh/cpu-sh2/rtc.h +++ b/arch/sh/include/cpu-sh2/cpu/rtc.h diff --git a/include/asm-sh/cpu-sh2/sigcontext.h b/arch/sh/include/cpu-sh2/cpu/sigcontext.h index fe5c15d..fe5c15d 100644 --- a/include/asm-sh/cpu-sh2/sigcontext.h +++ b/arch/sh/include/cpu-sh2/cpu/sigcontext.h diff --git a/include/asm-sh/cpu-sh2/timer.h b/arch/sh/include/cpu-sh2/cpu/timer.h index a39c241..a39c241 100644 --- a/include/asm-sh/cpu-sh2/timer.h +++ b/arch/sh/include/cpu-sh2/cpu/timer.h diff --git a/include/asm-sh/cpu-sh2/ubc.h b/arch/sh/include/cpu-sh2/cpu/ubc.h index ba0e87f..ba0e87f 100644 --- a/include/asm-sh/cpu-sh2/ubc.h +++ b/arch/sh/include/cpu-sh2/cpu/ubc.h diff --git a/include/asm-sh/cpu-sh2/watchdog.h b/arch/sh/include/cpu-sh2/cpu/watchdog.h index 393161c..393161c 100644 --- a/include/asm-sh/cpu-sh2/watchdog.h +++ b/arch/sh/include/cpu-sh2/cpu/watchdog.h diff --git a/include/asm-sh/cpu-sh2a/addrspace.h b/arch/sh/include/cpu-sh2a/cpu/addrspace.h index 795ddd6..795ddd6 100644 --- a/include/asm-sh/cpu-sh2a/addrspace.h +++ b/arch/sh/include/cpu-sh2a/cpu/addrspace.h diff --git a/include/asm-sh/cpu-sh2a/cache.h b/arch/sh/include/cpu-sh2a/cpu/cache.h index afe228b..afe228b 100644 --- a/include/asm-sh/cpu-sh2a/cache.h +++ b/arch/sh/include/cpu-sh2a/cpu/cache.h diff --git a/arch/sh/include/cpu-sh2a/cpu/cacheflush.h b/arch/sh/include/cpu-sh2a/cpu/cacheflush.h new file mode 100644 index 0000000..2979efb --- /dev/null +++ b/arch/sh/include/cpu-sh2a/cpu/cacheflush.h @@ -0,0 +1,44 @@ +/* + * include/asm-sh/cpu-sh2/cacheflush.h + * + * Copyright (C) 2003 Paul Mundt + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + */ +#ifndef __ASM_CPU_SH2_CACHEFLUSH_H +#define __ASM_CPU_SH2_CACHEFLUSH_H + +/* + * Cache flushing: + * + * - flush_cache_all() flushes entire cache + * - flush_cache_mm(mm) flushes the specified mm context's cache lines + * - flush_cache_dup mm(mm) handles cache flushing when forking + * - flush_cache_page(mm, vmaddr, pfn) flushes a single page + * - flush_cache_range(vma, start, end) flushes a range of pages + * + * - flush_dcache_page(pg) flushes(wback&invalidates) a page for dcache + * - flush_icache_range(start, end) flushes(invalidates) a range for icache + * - flush_icache_page(vma, pg) flushes(invalidates) a page for icache + * + * Caches are indexed (effectively) by physical address on SH-2, so + * we don't need them. + */ +#define flush_cache_all() do { } while (0) +#define flush_cache_mm(mm) do { } while (0) +#define flush_cache_dup_mm(mm) do { } while (0) +#define flush_cache_range(vma, start, end) do { } while (0) +#define flush_cache_page(vma, vmaddr, pfn) do { } while (0) +#define flush_dcache_page(page) do { } while (0) +#define flush_dcache_mmap_lock(mapping) do { } while (0) +#define flush_dcache_mmap_unlock(mapping) do { } while (0) +#define flush_icache_range(start, end) do { } while (0) +#define flush_icache_page(vma,pg) do { } while (0) +#define flush_icache_user_range(vma,pg,adr,len) do { } while (0) +#define flush_cache_sigtramp(vaddr) do { } while (0) + +#define p3_cache_init() do { } while (0) +#endif /* __ASM_CPU_SH2_CACHEFLUSH_H */ + diff --git a/arch/sh/include/cpu-sh2a/cpu/dma.h b/arch/sh/include/cpu-sh2a/cpu/dma.h new file mode 100644 index 0000000..d66b43c --- /dev/null +++ b/arch/sh/include/cpu-sh2a/cpu/dma.h @@ -0,0 +1,23 @@ +/* + * Definitions for the SH-2 DMAC. + * + * Copyright (C) 2003 Paul Mundt + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + */ +#ifndef __ASM_CPU_SH2_DMA_H +#define __ASM_CPU_SH2_DMA_H + +#define SH_MAX_DMA_CHANNELS 2 + +#define SAR ((unsigned long[]){ 0xffffff80, 0xffffff90 }) +#define DAR ((unsigned long[]){ 0xffffff84, 0xffffff94 }) +#define DMATCR ((unsigned long[]){ 0xffffff88, 0xffffff98 }) +#define CHCR ((unsigned long[]){ 0xfffffffc, 0xffffff9c }) + +#define DMAOR 0xffffffb0 + +#endif /* __ASM_CPU_SH2_DMA_H */ + diff --git a/include/asm-sh/cpu-sh2a/freq.h b/arch/sh/include/cpu-sh2a/cpu/freq.h index 830fd43..830fd43 100644 --- a/include/asm-sh/cpu-sh2a/freq.h +++ b/arch/sh/include/cpu-sh2a/cpu/freq.h diff --git a/arch/sh/include/cpu-sh2a/cpu/mmu_context.h b/arch/sh/include/cpu-sh2a/cpu/mmu_context.h new file mode 100644 index 0000000..beeb299 --- /dev/null +++ b/arch/sh/include/cpu-sh2a/cpu/mmu_context.h @@ -0,0 +1,16 @@ +/* + * include/asm-sh/cpu-sh2/mmu_context.h + * + * Copyright (C) 2003 Paul Mundt + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + */ +#ifndef __ASM_CPU_SH2_MMU_CONTEXT_H +#define __ASM_CPU_SH2_MMU_CONTEXT_H + +/* No MMU */ + +#endif /* __ASM_CPU_SH2_MMU_CONTEXT_H */ + diff --git a/include/asm-sh/cpu-sh2a/rtc.h b/arch/sh/include/cpu-sh2a/cpu/rtc.h index afb511e..afb511e 100644 --- a/include/asm-sh/cpu-sh2a/rtc.h +++ b/arch/sh/include/cpu-sh2a/cpu/rtc.h diff --git a/arch/sh/include/cpu-sh2a/cpu/timer.h b/arch/sh/include/cpu-sh2a/cpu/timer.h new file mode 100644 index 0000000..a39c241 --- /dev/null +++ b/arch/sh/include/cpu-sh2a/cpu/timer.h @@ -0,0 +1,6 @@ +#ifndef __ASM_CPU_SH2_TIMER_H +#define __ASM_CPU_SH2_TIMER_H + +/* Nothing needed yet */ + +#endif /* __ASM_CPU_SH2_TIMER_H */ diff --git a/arch/sh/include/cpu-sh2a/cpu/ubc.h b/arch/sh/include/cpu-sh2a/cpu/ubc.h new file mode 100644 index 0000000..ba0e87f --- /dev/null +++ b/arch/sh/include/cpu-sh2a/cpu/ubc.h @@ -0,0 +1,32 @@ +/* + * include/asm-sh/cpu-sh2/ubc.h + * + * Copyright (C) 2003 Paul Mundt + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + */ +#ifndef __ASM_CPU_SH2_UBC_H +#define __ASM_CPU_SH2_UBC_H + +#define UBC_BARA 0xffffff40 +#define UBC_BAMRA 0xffffff44 +#define UBC_BBRA 0xffffff48 +#define UBC_BARB 0xffffff60 +#define UBC_BAMRB 0xffffff64 +#define UBC_BBRB 0xffffff68 +#define UBC_BDRB 0xffffff70 +#define UBC_BDMRB 0xffffff74 +#define UBC_BRCR 0xffffff78 + +/* + * We don't have any ASID changes to make in the UBC on the SH-2. + * + * Make these purposely invalid to track misuse. + */ +#define UBC_BASRA 0x00000000 +#define UBC_BASRB 0x00000000 + +#endif /* __ASM_CPU_SH2_UBC_H */ + diff --git a/arch/sh/include/cpu-sh2a/cpu/watchdog.h b/arch/sh/include/cpu-sh2a/cpu/watchdog.h new file mode 100644 index 0000000..393161c --- /dev/null +++ b/arch/sh/include/cpu-sh2a/cpu/watchdog.h @@ -0,0 +1,69 @@ +/* + * include/asm-sh/cpu-sh2/watchdog.h + * + * Copyright (C) 2002, 2003 Paul Mundt + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + */ +#ifndef __ASM_CPU_SH2_WATCHDOG_H +#define __ASM_CPU_SH2_WATCHDOG_H + +/* + * More SH-2 brilliance .. its not good enough that we can't read + * and write the same sizes to WTCNT, now we have to read and write + * with different sizes at different addresses for WTCNT _and_ RSTCSR. + * + * At least on the bright side no one has managed to screw over WTCSR + * in this fashion .. yet. + */ +/* Register definitions */ +#define WTCNT 0xfffffe80 +#define WTCSR 0xfffffe80 +#define RSTCSR 0xfffffe82 + +#define WTCNT_R (WTCNT + 1) +#define RSTCSR_R (RSTCSR + 1) + +/* Bit definitions */ +#define WTCSR_IOVF 0x80 +#define WTCSR_WT 0x40 +#define WTCSR_TME 0x20 +#define WTCSR_RSTS 0x00 + +#define RSTCSR_RSTS 0x20 + +/** + * sh_wdt_read_rstcsr - Read from Reset Control/Status Register + * + * Reads back the RSTCSR value. + */ +static inline __u8 sh_wdt_read_rstcsr(void) +{ + /* + * Same read/write brain-damage as for WTCNT here.. + */ + return ctrl_inb(RSTCSR_R); +} + +/** + * sh_wdt_write_csr - Write to Reset Control/Status Register + * + * @val: Value to write + * + * Writes the given value @val to the lower byte of the control/status + * register. The upper byte is set manually on each write. + */ +static inline void sh_wdt_write_rstcsr(__u8 val) +{ + /* + * Note: Due to the brain-damaged nature of this register, + * we can't presently touch the WOVF bit, since the upper byte + * has to be swapped for this. So just leave it alone.. + */ + ctrl_outw((WTCNT_HIGH << 8) | (__u16)val, RSTCSR); +} + +#endif /* __ASM_CPU_SH2_WATCHDOG_H */ + diff --git a/include/asm-sh/cpu-sh3/adc.h b/arch/sh/include/cpu-sh3/cpu/adc.h index b289e3c..b289e3c 100644 --- a/include/asm-sh/cpu-sh3/adc.h +++ b/arch/sh/include/cpu-sh3/cpu/adc.h diff --git a/include/asm-sh/cpu-sh3/addrspace.h b/arch/sh/include/cpu-sh3/cpu/addrspace.h index 0f94726..0f94726 100644 --- a/include/asm-sh/cpu-sh3/addrspace.h +++ b/arch/sh/include/cpu-sh3/cpu/addrspace.h diff --git a/include/asm-sh/cpu-sh3/cache.h b/arch/sh/include/cpu-sh3/cpu/cache.h index bee2d81..bee2d81 100644 --- a/include/asm-sh/cpu-sh3/cache.h +++ b/arch/sh/include/cpu-sh3/cpu/cache.h diff --git a/include/asm-sh/cpu-sh3/cacheflush.h b/arch/sh/include/cpu-sh3/cpu/cacheflush.h index f70d8ef7..f70d8ef7 100644 --- a/include/asm-sh/cpu-sh3/cacheflush.h +++ b/arch/sh/include/cpu-sh3/cpu/cacheflush.h diff --git a/include/asm-sh/cpu-sh3/dac.h b/arch/sh/include/cpu-sh3/cpu/dac.h index 05fda83..05fda83 100644 --- a/include/asm-sh/cpu-sh3/dac.h +++ b/arch/sh/include/cpu-sh3/cpu/dac.h diff --git a/include/asm-sh/cpu-sh3/dma.h b/arch/sh/include/cpu-sh3/cpu/dma.h index 6813c32..6813c32 100644 --- a/include/asm-sh/cpu-sh3/dma.h +++ b/arch/sh/include/cpu-sh3/cpu/dma.h diff --git a/include/asm-sh/cpu-sh3/freq.h b/arch/sh/include/cpu-sh3/cpu/freq.h index 53c6230..53c6230 100644 --- a/include/asm-sh/cpu-sh3/freq.h +++ b/arch/sh/include/cpu-sh3/cpu/freq.h diff --git a/include/asm-sh/cpu-sh3/gpio.h b/arch/sh/include/cpu-sh3/cpu/gpio.h index 4e53eb3..4e53eb3 100644 --- a/include/asm-sh/cpu-sh3/gpio.h +++ b/arch/sh/include/cpu-sh3/cpu/gpio.h diff --git a/include/asm-sh/cpu-sh3/mmu_context.h b/arch/sh/include/cpu-sh3/cpu/mmu_context.h index ab09da7..ab09da7 100644 --- a/include/asm-sh/cpu-sh3/mmu_context.h +++ b/arch/sh/include/cpu-sh3/cpu/mmu_context.h diff --git a/include/asm-sh/cpu-sh3/rtc.h b/arch/sh/include/cpu-sh3/cpu/rtc.h index 319404a..319404a 100644 --- a/include/asm-sh/cpu-sh3/rtc.h +++ b/arch/sh/include/cpu-sh3/cpu/rtc.h diff --git a/include/asm-sh/cpu-sh3/sigcontext.h b/arch/sh/include/cpu-sh3/cpu/sigcontext.h index 17310dc..17310dc 100644 --- a/include/asm-sh/cpu-sh3/sigcontext.h +++ b/arch/sh/include/cpu-sh3/cpu/sigcontext.h diff --git a/include/asm-sh/cpu-sh3/timer.h b/arch/sh/include/cpu-sh3/cpu/timer.h index 793acf1..793acf1 100644 --- a/include/asm-sh/cpu-sh3/timer.h +++ b/arch/sh/include/cpu-sh3/cpu/timer.h diff --git a/include/asm-sh/cpu-sh3/ubc.h b/arch/sh/include/cpu-sh3/cpu/ubc.h index 4e6381d..4e6381d 100644 --- a/include/asm-sh/cpu-sh3/ubc.h +++ b/arch/sh/include/cpu-sh3/cpu/ubc.h diff --git a/include/asm-sh/cpu-sh3/watchdog.h b/arch/sh/include/cpu-sh3/cpu/watchdog.h index 4ee0347..4ee0347 100644 --- a/include/asm-sh/cpu-sh3/watchdog.h +++ b/arch/sh/include/cpu-sh3/cpu/watchdog.h diff --git a/include/asm-sh/cpu-sh4/addrspace.h b/arch/sh/include/cpu-sh4/cpu/addrspace.h index a3fa733..a3fa733 100644 --- a/include/asm-sh/cpu-sh4/addrspace.h +++ b/arch/sh/include/cpu-sh4/cpu/addrspace.h diff --git a/include/asm-sh/cpu-sh4/cache.h b/arch/sh/include/cpu-sh4/cpu/cache.h index 1c61ebf..1c61ebf 100644 --- a/include/asm-sh/cpu-sh4/cache.h +++ b/arch/sh/include/cpu-sh4/cpu/cache.h diff --git a/include/asm-sh/cpu-sh4/cacheflush.h b/arch/sh/include/cpu-sh4/cpu/cacheflush.h index 065306d..065306d 100644 --- a/include/asm-sh/cpu-sh4/cacheflush.h +++ b/arch/sh/include/cpu-sh4/cpu/cacheflush.h diff --git a/include/asm-sh/cpu-sh4/dma-sh7780.h b/arch/sh/include/cpu-sh4/cpu/dma-sh7780.h index 71b426a..71b426a 100644 --- a/include/asm-sh/cpu-sh4/dma-sh7780.h +++ b/arch/sh/include/cpu-sh4/cpu/dma-sh7780.h diff --git a/include/asm-sh/cpu-sh4/dma.h b/arch/sh/include/cpu-sh4/cpu/dma.h index aaf71b0..235b7cd 100644 --- a/include/asm-sh/cpu-sh4/dma.h +++ b/arch/sh/include/cpu-sh4/cpu/dma.h @@ -20,7 +20,7 @@ #define CHCR_TS_MASK 0x18 #define CHCR_TS_SHIFT 3 -#include <asm/cpu/dma-sh7780.h> +#include <cpu/dma-sh7780.h> #else #define SH_DMAC_BASE 0xffa00000 diff --git a/include/asm-sh/cpu-sh4/fpu.h b/arch/sh/include/cpu-sh4/cpu/fpu.h index febef73..febef73 100644 --- a/include/asm-sh/cpu-sh4/fpu.h +++ b/arch/sh/include/cpu-sh4/cpu/fpu.h diff --git a/include/asm-sh/cpu-sh4/freq.h b/arch/sh/include/cpu-sh4/cpu/freq.h index c23af81..c23af81 100644 --- a/include/asm-sh/cpu-sh4/freq.h +++ b/arch/sh/include/cpu-sh4/cpu/freq.h diff --git a/include/asm-sh/cpu-sh4/mmu_context.h b/arch/sh/include/cpu-sh4/cpu/mmu_context.h index 9ea8eb2..9ea8eb2 100644 --- a/include/asm-sh/cpu-sh4/mmu_context.h +++ b/arch/sh/include/cpu-sh4/cpu/mmu_context.h diff --git a/include/asm-sh/cpu-sh4/rtc.h b/arch/sh/include/cpu-sh4/cpu/rtc.h index 25b1e6a..25b1e6a 100644 --- a/include/asm-sh/cpu-sh4/rtc.h +++ b/arch/sh/include/cpu-sh4/cpu/rtc.h diff --git a/include/asm-sh/cpu-sh4/sigcontext.h b/arch/sh/include/cpu-sh4/cpu/sigcontext.h index ab392f1..ab392f1 100644 --- a/include/asm-sh/cpu-sh4/sigcontext.h +++ b/arch/sh/include/cpu-sh4/cpu/sigcontext.h diff --git a/include/asm-sh/cpu-sh4/sq.h b/arch/sh/include/cpu-sh4/cpu/sq.h index 586d649..586d649 100644 --- a/include/asm-sh/cpu-sh4/sq.h +++ b/arch/sh/include/cpu-sh4/cpu/sq.h diff --git a/include/asm-sh/cpu-sh4/timer.h b/arch/sh/include/cpu-sh4/cpu/timer.h index d1e796b..d1e796b 100644 --- a/include/asm-sh/cpu-sh4/timer.h +++ b/arch/sh/include/cpu-sh4/cpu/timer.h diff --git a/include/asm-sh/cpu-sh4/ubc.h b/arch/sh/include/cpu-sh4/cpu/ubc.h index c86e170..c86e170 100644 --- a/include/asm-sh/cpu-sh4/ubc.h +++ b/arch/sh/include/cpu-sh4/cpu/ubc.h diff --git a/include/asm-sh/cpu-sh4/watchdog.h b/arch/sh/include/cpu-sh4/cpu/watchdog.h index 259f6a0..259f6a0 100644 --- a/include/asm-sh/cpu-sh4/watchdog.h +++ b/arch/sh/include/cpu-sh4/cpu/watchdog.h diff --git a/include/asm-sh/cpu-sh5/addrspace.h b/arch/sh/include/cpu-sh5/cpu/addrspace.h index dc36b9a..dc36b9a 100644 --- a/include/asm-sh/cpu-sh5/addrspace.h +++ b/arch/sh/include/cpu-sh5/cpu/addrspace.h diff --git a/include/asm-sh/cpu-sh5/cache.h b/arch/sh/include/cpu-sh5/cpu/cache.h index ed050ab..ed050ab 100644 --- a/include/asm-sh/cpu-sh5/cache.h +++ b/arch/sh/include/cpu-sh5/cpu/cache.h diff --git a/include/asm-sh/cpu-sh5/cacheflush.h b/arch/sh/include/cpu-sh5/cpu/cacheflush.h index 5a11f0b..5a11f0b 100644 --- a/include/asm-sh/cpu-sh5/cacheflush.h +++ b/arch/sh/include/cpu-sh5/cpu/cacheflush.h diff --git a/include/asm-sh/cpu-sh5/dma.h b/arch/sh/include/cpu-sh5/cpu/dma.h index 7bf6bb3..7bf6bb3 100644 --- a/include/asm-sh/cpu-sh5/dma.h +++ b/arch/sh/include/cpu-sh5/cpu/dma.h diff --git a/include/asm-sh/cpu-sh5/irq.h b/arch/sh/include/cpu-sh5/cpu/irq.h index f0f0756..f0f0756 100644 --- a/include/asm-sh/cpu-sh5/irq.h +++ b/arch/sh/include/cpu-sh5/cpu/irq.h diff --git a/include/asm-sh/cpu-sh5/mmu_context.h b/arch/sh/include/cpu-sh5/cpu/mmu_context.h index 68a1d2c..68a1d2c 100644 --- a/include/asm-sh/cpu-sh5/mmu_context.h +++ b/arch/sh/include/cpu-sh5/cpu/mmu_context.h diff --git a/include/asm-sh/cpu-sh5/registers.h b/arch/sh/include/cpu-sh5/cpu/registers.h index 6664ea6..6664ea6 100644 --- a/include/asm-sh/cpu-sh5/registers.h +++ b/arch/sh/include/cpu-sh5/cpu/registers.h diff --git a/include/asm-sh/cpu-sh5/rtc.h b/arch/sh/include/cpu-sh5/cpu/rtc.h index 12ea0ed..12ea0ed 100644 --- a/include/asm-sh/cpu-sh5/rtc.h +++ b/arch/sh/include/cpu-sh5/cpu/rtc.h diff --git a/include/asm-sh/cpu-sh5/timer.h b/arch/sh/include/cpu-sh5/cpu/timer.h index 88da9b3..88da9b3 100644 --- a/include/asm-sh/cpu-sh5/timer.h +++ b/arch/sh/include/cpu-sh5/cpu/timer.h diff --git a/include/asm-sh/dreamcast/dma.h b/arch/sh/include/mach-dreamcast/mach/dma.h index ddd68e7..ddd68e7 100644 --- a/include/asm-sh/dreamcast/dma.h +++ b/arch/sh/include/mach-dreamcast/mach/dma.h diff --git a/include/asm-sh/dreamcast/maple.h b/arch/sh/include/mach-dreamcast/mach/maple.h index 51f6a87..51f6a87 100644 --- a/include/asm-sh/dreamcast/maple.h +++ b/arch/sh/include/mach-dreamcast/mach/maple.h diff --git a/include/asm-sh/dreamcast/pci.h b/arch/sh/include/mach-dreamcast/mach/pci.h index e401b24..9264ff4 100644 --- a/include/asm-sh/dreamcast/pci.h +++ b/arch/sh/include/mach-dreamcast/mach/pci.h @@ -11,7 +11,7 @@ #ifndef __ASM_SH_DREAMCAST_PCI_H #define __ASM_SH_DREAMCAST_PCI_H -#include <asm/mach/sysasic.h> +#include <mach/sysasic.h> #define GAPSPCI_REGS 0x01001400 #define GAPSPCI_DMA_BASE 0x01840000 diff --git a/include/asm-sh/dreamcast/sysasic.h b/arch/sh/include/mach-dreamcast/mach/sysasic.h index f334266..f334266 100644 --- a/include/asm-sh/dreamcast/sysasic.h +++ b/arch/sh/include/mach-dreamcast/mach/sysasic.h diff --git a/include/asm-sh/landisk/gio.h b/arch/sh/include/mach-landisk/mach/gio.h index 35d7368..35d7368 100644 --- a/include/asm-sh/landisk/gio.h +++ b/arch/sh/include/mach-landisk/mach/gio.h diff --git a/include/asm-sh/landisk/iodata_landisk.h b/arch/sh/include/mach-landisk/mach/iodata_landisk.h index 6fb04ab..6fb04ab 100644 --- a/include/asm-sh/landisk/iodata_landisk.h +++ b/arch/sh/include/mach-landisk/mach/iodata_landisk.h diff --git a/include/asm-sh/sh03/io.h b/arch/sh/include/mach-sh03/mach/io.h index c39c785..c39c785 100644 --- a/include/asm-sh/sh03/io.h +++ b/arch/sh/include/mach-sh03/mach/io.h diff --git a/include/asm-sh/sh03/sh03.h b/arch/sh/include/mach-sh03/mach/sh03.h index 19c40b8..19c40b8 100644 --- a/include/asm-sh/sh03/sh03.h +++ b/arch/sh/include/mach-sh03/mach/sh03.h diff --git a/arch/sh/kernel/cpu/irq/intc-sh5.c b/arch/sh/kernel/cpu/irq/intc-sh5.c index 79baa47..726f033 100644 --- a/arch/sh/kernel/cpu/irq/intc-sh5.c +++ b/arch/sh/kernel/cpu/irq/intc-sh5.c @@ -20,7 +20,7 @@ #include <linux/io.h> #include <linux/kernel.h> #include <linux/bitops.h> -#include <asm/cpu/irq.h> +#include <cpu/irq.h> #include <asm/page.h> /* diff --git a/arch/sh/kernel/cpu/sh2/entry.S b/arch/sh/kernel/cpu/sh2/entry.S index ee894e5..becc54c45 100644 --- a/arch/sh/kernel/cpu/sh2/entry.S +++ b/arch/sh/kernel/cpu/sh2/entry.S @@ -14,7 +14,7 @@ #include <linux/linkage.h> #include <asm/asm-offsets.h> #include <asm/thread_info.h> -#include <asm/cpu/mmu_context.h> +#include <cpu/mmu_context.h> #include <asm/unistd.h> #include <asm/errno.h> #include <asm/page.h> diff --git a/arch/sh/kernel/cpu/sh2a/entry.S b/arch/sh/kernel/cpu/sh2a/entry.S index 47096dc..ab3903e 100644 --- a/arch/sh/kernel/cpu/sh2a/entry.S +++ b/arch/sh/kernel/cpu/sh2a/entry.S @@ -14,7 +14,7 @@ #include <linux/linkage.h> #include <asm/asm-offsets.h> #include <asm/thread_info.h> -#include <asm/cpu/mmu_context.h> +#include <cpu/mmu_context.h> #include <asm/unistd.h> #include <asm/errno.h> #include <asm/page.h> diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S index 4004073..3fe482d 100644 --- a/arch/sh/kernel/cpu/sh3/entry.S +++ b/arch/sh/kernel/cpu/sh3/entry.S @@ -14,7 +14,7 @@ #include <asm/asm-offsets.h> #include <asm/thread_info.h> #include <asm/unistd.h> -#include <asm/cpu/mmu_context.h> +#include <cpu/mmu_context.h> #include <asm/page.h> ! NOTE: diff --git a/arch/sh/kernel/cpu/sh4/fpu.c b/arch/sh/kernel/cpu/sh4/fpu.c index 8020796..2d452f6 100644 --- a/arch/sh/kernel/cpu/sh4/fpu.c +++ b/arch/sh/kernel/cpu/sh4/fpu.c @@ -13,7 +13,7 @@ #include <linux/sched.h> #include <linux/signal.h> #include <linux/io.h> -#include <asm/cpu/fpu.h> +#include <cpu/fpu.h> #include <asm/processor.h> #include <asm/system.h> #include <asm/fpu.h> diff --git a/arch/sh/kernel/cpu/sh4/softfloat.c b/arch/sh/kernel/cpu/sh4/softfloat.c index 7b2d337..828cb57 100644 --- a/arch/sh/kernel/cpu/sh4/softfloat.c +++ b/arch/sh/kernel/cpu/sh4/softfloat.c @@ -36,7 +36,7 @@ * and Kamel Khelifi <kamel.khelifi@st.com> */ #include <linux/kernel.h> -#include <asm/cpu/fpu.h> +#include <cpu/fpu.h> #define LIT64( a ) a##LL diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c index 9561b02..dcdf959 100644 --- a/arch/sh/kernel/cpu/sh4/sq.c +++ b/arch/sh/kernel/cpu/sh4/sq.c @@ -22,7 +22,7 @@ #include <linux/io.h> #include <asm/page.h> #include <asm/cacheflush.h> -#include <asm/cpu/sq.h> +#include <cpu/sq.h> struct sq_mapping; diff --git a/arch/sh/kernel/cpu/sh5/entry.S b/arch/sh/kernel/cpu/sh5/entry.S index 05372ed..ca08e7f 100644 --- a/arch/sh/kernel/cpu/sh5/entry.S +++ b/arch/sh/kernel/cpu/sh5/entry.S @@ -11,7 +11,7 @@ */ #include <linux/errno.h> #include <linux/sys.h> -#include <asm/cpu/registers.h> +#include <cpu/registers.h> #include <asm/processor.h> #include <asm/unistd.h> #include <asm/thread_info.h> diff --git a/arch/sh/kernel/head_64.S b/arch/sh/kernel/head_64.S index f42d4c0..7ccfb99 100644 --- a/arch/sh/kernel/head_64.S +++ b/arch/sh/kernel/head_64.S @@ -11,8 +11,8 @@ #include <asm/page.h> #include <asm/cache.h> #include <asm/tlb.h> -#include <asm/cpu/registers.h> -#include <asm/cpu/mmu_context.h> +#include <cpu/registers.h> +#include <cpu/mmu_context.h> #include <asm/thread_info.h> /* diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c index a2a99e4..64b7690 100644 --- a/arch/sh/kernel/irq.c +++ b/arch/sh/kernel/irq.c @@ -15,7 +15,7 @@ #include <asm/machvec.h> #include <asm/uaccess.h> #include <asm/thread_info.h> -#include <asm/cpu/mmu_context.h> +#include <cpu/mmu_context.h> atomic_t irq_err_count; diff --git a/arch/sh/kernel/time_64.c b/arch/sh/kernel/time_64.c index 022a55f..791edab 100644 --- a/arch/sh/kernel/time_64.c +++ b/arch/sh/kernel/time_64.c @@ -33,8 +33,8 @@ #include <linux/irq.h> #include <linux/io.h> #include <linux/platform_device.h> -#include <asm/cpu/registers.h> /* required by inline __asm__ stmt. */ -#include <asm/cpu/irq.h> +#include <cpu/registers.h> /* required by inline __asm__ stmt. */ +#include <cpu/irq.h> #include <asm/addrspace.h> #include <asm/processor.h> #include <asm/uaccess.h> diff --git a/arch/sh/lib64/panic.c b/arch/sh/lib64/panic.c index ff559e2..da32ba7 100644 --- a/arch/sh/lib64/panic.c +++ b/arch/sh/lib64/panic.c @@ -8,7 +8,7 @@ #include <linux/kernel.h> #include <asm/io.h> -#include <asm/cpu/registers.h> +#include <cpu/registers.h> /* THIS IS A PHYSICAL ADDRESS */ #define HDSP2534_ADDR (0x04002100) diff --git a/arch/sh/mm/fault_64.c b/arch/sh/mm/fault_64.c index 399d537..bd63b96 100644 --- a/arch/sh/mm/fault_64.c +++ b/arch/sh/mm/fault_64.c @@ -39,7 +39,7 @@ #include <asm/uaccess.h> #include <asm/pgalloc.h> #include <asm/mmu_context.h> -#include <asm/cpu/registers.h> +#include <cpu/registers.h> /* Callable from fault.c, so not static */ inline void __do_tlb_refill(unsigned long address, diff --git a/arch/sh/tools/Makefile b/arch/sh/tools/Makefile index 567516b..b5d202b 100644 --- a/arch/sh/tools/Makefile +++ b/arch/sh/tools/Makefile @@ -10,7 +10,7 @@ # Shamelessly cloned from ARM. # -include/asm-sh/machtypes.h: $(src)/gen-mach-types $(src)/mach-types +arch/sh/include/asm/machtypes.h: $(src)/gen-mach-types $(src)/mach-types @echo ' Generating $@' - $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi + $(Q)if [ ! -d arch/sh/include/asm ]; then mkdir -p arch/sh/include/asm; fi $(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; } diff --git a/include/asm-sh/cpu-sh2a/cacheflush.h b/include/asm-sh/cpu-sh2a/cacheflush.h deleted file mode 100644 index fa3186c..0000000 --- a/include/asm-sh/cpu-sh2a/cacheflush.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm/cpu-sh2/cacheflush.h> diff --git a/include/asm-sh/cpu-sh2a/dma.h b/include/asm-sh/cpu-sh2a/dma.h deleted file mode 100644 index 0d5ad85..0000000 --- a/include/asm-sh/cpu-sh2a/dma.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm/cpu-sh2/dma.h> diff --git a/include/asm-sh/cpu-sh2a/mmu_context.h b/include/asm-sh/cpu-sh2a/mmu_context.h deleted file mode 100644 index cd2387f..0000000 --- a/include/asm-sh/cpu-sh2a/mmu_context.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm/cpu-sh2/mmu_context.h> diff --git a/include/asm-sh/cpu-sh2a/timer.h b/include/asm-sh/cpu-sh2a/timer.h deleted file mode 100644 index fee504a..0000000 --- a/include/asm-sh/cpu-sh2a/timer.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm/cpu-sh2/timer.h> diff --git a/include/asm-sh/cpu-sh2a/ubc.h b/include/asm-sh/cpu-sh2a/ubc.h deleted file mode 100644 index cf28062..0000000 --- a/include/asm-sh/cpu-sh2a/ubc.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm/cpu-sh2/ubc.h> diff --git a/include/asm-sh/cpu-sh2a/watchdog.h b/include/asm-sh/cpu-sh2a/watchdog.h deleted file mode 100644 index c1b3e24..0000000 --- a/include/asm-sh/cpu-sh2a/watchdog.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm/cpu-sh2/watchdog.h> diff --git a/sound/sh/aica.c b/sound/sh/aica.c index 9ca1133..54df8ba 100644 --- a/sound/sh/aica.c +++ b/sound/sh/aica.c @@ -42,7 +42,7 @@ #include <sound/info.h> #include <asm/io.h> #include <asm/dma.h> -#include <asm/dreamcast/sysasic.h> +#include <mach/sysasic.h> #include "aica.h" MODULE_AUTHOR("Adrian McMenamin <adrian@mcmen.demon.co.uk>"); |