Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
Linus Torvalds [Sun, 2 Nov 2008 21:32:26 +0000 (13:32 -0800)]
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide-gd: re-get capacity on revalidate
  tx4938ide: Avoid underflow on calculation of a wait cycle
  tx4938ide: Do not call devm_ioremap for whole 128KB
  tx4938ide: Check minimum cycle time and SHWT range (v2)
  ide: Switch to a common address
  ide-cd: fix DMA alignment regression

574 files changed:
Documentation/sh/new-machine.txt
MAINTAINERS
arch/cris/Makefile
arch/cris/arch-v10/boot/.gitignore [new file with mode: 0644]
arch/cris/arch-v10/boot/compressed/head.S
arch/cris/arch-v10/boot/compressed/misc.c
arch/cris/arch-v10/boot/rescue/head.S
arch/cris/arch-v10/boot/rescue/kimagerescue.S
arch/cris/arch-v10/boot/rescue/testrescue.S
arch/cris/arch-v10/drivers/axisflashmap.c
arch/cris/arch-v10/drivers/ds1302.c
arch/cris/arch-v10/drivers/gpio.c
arch/cris/arch-v10/drivers/i2c.c
arch/cris/arch-v10/drivers/sync_serial.c
arch/cris/arch-v10/kernel/asm-offsets.c [deleted file]
arch/cris/arch-v10/kernel/crisksyms.c
arch/cris/arch-v10/kernel/debugport.c
arch/cris/arch-v10/kernel/dma.c
arch/cris/arch-v10/kernel/entry.S
arch/cris/arch-v10/kernel/fasttimer.c
arch/cris/arch-v10/kernel/head.S
arch/cris/arch-v10/kernel/io_interface_mux.c
arch/cris/arch-v10/kernel/kgdb.c
arch/cris/arch-v10/kernel/process.c
arch/cris/arch-v10/kernel/time.c
arch/cris/arch-v10/kernel/traps.c
arch/cris/arch-v10/mm/fault.c
arch/cris/arch-v10/mm/init.c
arch/cris/arch-v10/mm/tlb.c
arch/cris/arch-v10/vmlinux.lds.S [deleted file]
arch/cris/arch-v32/boot/compressed/head.S
arch/cris/arch-v32/drivers/mach-a3/gpio.c
arch/cris/arch-v32/drivers/mach-a3/nandflash.c
arch/cris/arch-v32/drivers/mach-fs/nandflash.c
arch/cris/arch-v32/drivers/pci/bios.c
arch/cris/arch-v32/kernel/cache.c
arch/cris/arch-v32/kernel/crisksyms.c
arch/cris/arch-v32/kernel/debugport.c
arch/cris/arch-v32/kernel/entry.S
arch/cris/arch-v32/kernel/head.S
arch/cris/arch-v32/kernel/kgdb.c
arch/cris/arch-v32/kernel/kgdb_asm.S
arch/cris/arch-v32/kernel/pinmux.c
arch/cris/arch-v32/kernel/ptrace.c
arch/cris/arch-v32/kernel/signal.c
arch/cris/arch-v32/lib/nand_init.S
arch/cris/arch-v32/mach-a3/dma.c
arch/cris/arch-v32/mach-a3/io.c
arch/cris/arch-v32/mach-fs/cpufreq.c
arch/cris/arch-v32/mach-fs/dma.c
arch/cris/arch-v32/mach-fs/io.c
arch/cris/arch-v32/mach-fs/vcs_hook.c
arch/cris/arch-v32/mm/init.c
arch/cris/arch-v32/mm/tlb.c
arch/cris/include/arch-v10/arch/Kbuild [moved from include/asm-cris/arch-v10/Kbuild with 100% similarity]
arch/cris/include/arch-v10/arch/atomic.h [moved from include/asm-cris/arch-v10/atomic.h with 100% similarity]
arch/cris/include/arch-v10/arch/bitops.h [moved from include/asm-cris/arch-v10/bitops.h with 100% similarity]
arch/cris/include/arch-v10/arch/bug.h [moved from include/asm-cris/arch-v10/bug.h with 100% similarity]
arch/cris/include/arch-v10/arch/byteorder.h [moved from include/asm-cris/arch-v10/byteorder.h with 100% similarity]
arch/cris/include/arch-v10/arch/cache.h [moved from include/asm-cris/arch-v10/cache.h with 100% similarity]
arch/cris/include/arch-v10/arch/checksum.h [moved from include/asm-cris/arch-v10/checksum.h with 100% similarity]
arch/cris/include/arch-v10/arch/delay.h [moved from include/asm-cris/arch-v10/delay.h with 100% similarity]
arch/cris/include/arch-v10/arch/dma.h [moved from include/asm-cris/arch-v10/dma.h with 100% similarity]
arch/cris/include/arch-v10/arch/elf.h [moved from include/asm-cris/arch-v10/elf.h with 100% similarity]
arch/cris/include/arch-v10/arch/io.h [moved from include/asm-cris/arch-v10/io.h with 99% similarity]
arch/cris/include/arch-v10/arch/io_interface_mux.h [moved from include/asm-cris/arch-v10/io_interface_mux.h with 100% similarity]
arch/cris/include/arch-v10/arch/irq.h [moved from include/asm-cris/arch-v10/irq.h with 99% similarity]
arch/cris/include/arch-v10/arch/memmap.h [moved from include/asm-cris/arch-v10/memmap.h with 100% similarity]
arch/cris/include/arch-v10/arch/mmu.h [moved from include/asm-cris/arch-v10/mmu.h with 100% similarity]
arch/cris/include/arch-v10/arch/offset.h [moved from include/asm-cris/arch-v10/offset.h with 100% similarity]
arch/cris/include/arch-v10/arch/page.h [moved from include/asm-cris/arch-v10/page.h with 100% similarity]
arch/cris/include/arch-v10/arch/pgtable.h [moved from include/asm-cris/arch-v10/pgtable.h with 100% similarity]
arch/cris/include/arch-v10/arch/processor.h [moved from include/asm-cris/arch-v10/processor.h with 100% similarity]
arch/cris/include/arch-v10/arch/ptrace.h [moved from include/asm-cris/arch-v10/ptrace.h with 100% similarity]
arch/cris/include/arch-v10/arch/sv_addr.agh [moved from include/asm-cris/arch-v10/sv_addr.agh with 100% similarity]
arch/cris/include/arch-v10/arch/sv_addr_ag.h [moved from include/asm-cris/arch-v10/sv_addr_ag.h with 100% similarity]
arch/cris/include/arch-v10/arch/svinto.h [moved from include/asm-cris/arch-v10/svinto.h with 100% similarity]
arch/cris/include/arch-v10/arch/system.h [moved from include/asm-cris/arch-v10/system.h with 100% similarity]
arch/cris/include/arch-v10/arch/thread_info.h [moved from include/asm-cris/arch-v10/thread_info.h with 100% similarity]
arch/cris/include/arch-v10/arch/timex.h [moved from include/asm-cris/arch-v10/timex.h with 100% similarity]
arch/cris/include/arch-v10/arch/tlb.h [moved from include/asm-cris/arch-v10/tlb.h with 100% similarity]
arch/cris/include/arch-v10/arch/uaccess.h [moved from include/asm-cris/arch-v10/uaccess.h with 100% similarity]
arch/cris/include/arch-v10/arch/unistd.h [moved from include/asm-cris/arch-v10/unistd.h with 100% similarity]
arch/cris/include/arch-v10/arch/user.h [moved from include/asm-cris/arch-v10/user.h with 100% similarity]
arch/cris/include/arch-v32/arch/Kbuild [moved from include/asm-cris/arch-v32/Kbuild with 100% similarity]
arch/cris/include/arch-v32/arch/atomic.h [moved from include/asm-cris/arch-v32/atomic.h with 100% similarity]
arch/cris/include/arch-v32/arch/bitops.h [moved from include/asm-cris/arch-v32/bitops.h with 100% similarity]
arch/cris/include/arch-v32/arch/bug.h [moved from include/asm-cris/arch-v32/bug.h with 100% similarity]
arch/cris/include/arch-v32/arch/byteorder.h [moved from include/asm-cris/arch-v32/byteorder.h with 100% similarity]
arch/cris/include/arch-v32/arch/cache.h [moved from include/asm-cris/arch-v32/cache.h with 93% similarity]
arch/cris/include/arch-v32/arch/checksum.h [moved from include/asm-cris/arch-v32/checksum.h with 100% similarity]
arch/cris/include/arch-v32/arch/cryptocop.h [moved from include/asm-cris/arch-v32/cryptocop.h with 99% similarity]
arch/cris/include/arch-v32/arch/delay.h [moved from include/asm-cris/arch-v32/delay.h with 100% similarity]
arch/cris/include/arch-v32/arch/dma.h [moved from include/asm-cris/arch-v32/dma.h with 100% similarity]
arch/cris/include/arch-v32/arch/elf.h [moved from include/asm-cris/arch-v32/elf.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/Makefile [moved from include/asm-cris/arch-v32/hwregs/Makefile with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/ata_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/asm/ata_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/bif_core_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/asm/bif_core_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/bif_dma_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/asm/bif_dma_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/bif_slave_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/asm/bif_slave_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/config_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/asm/config_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/cpu_vect.h [moved from include/asm-cris/arch-v32/hwregs/asm/cpu_vect.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/cris_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/asm/cris_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/cris_supp_reg.h [moved from include/asm-cris/arch-v32/hwregs/asm/cris_supp_reg.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/dma_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/asm/dma_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/eth_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/asm/eth_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/gio_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/asm/gio_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/intr_vect.h [moved from include/asm-cris/arch-v32/hwregs/asm/intr_vect.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/intr_vect_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/asm/intr_vect_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/irq_nmi_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/asm/irq_nmi_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/marb_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/asm/marb_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/mmu_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/asm/mmu_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/mmu_supp_reg.h [moved from include/asm-cris/arch-v32/hwregs/asm/mmu_supp_reg.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/rt_trace_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/asm/rt_trace_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/ser_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/asm/ser_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/sser_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/asm/sser_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/strcop_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/asm/strcop_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/strmux_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/asm/strmux_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/asm/timer_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/asm/timer_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/ata_defs.h [moved from include/asm-cris/arch-v32/hwregs/ata_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/bif_core_defs.h [moved from include/asm-cris/arch-v32/hwregs/bif_core_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/bif_dma_defs.h [moved from include/asm-cris/arch-v32/hwregs/bif_dma_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/bif_slave_defs.h [moved from include/asm-cris/arch-v32/hwregs/bif_slave_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/config_defs.h [moved from include/asm-cris/arch-v32/hwregs/config_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/cpu_vect.h [moved from include/asm-cris/arch-v32/hwregs/cpu_vect.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/dma.h [moved from include/asm-cris/arch-v32/hwregs/dma.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/dma_defs.h [moved from include/asm-cris/arch-v32/hwregs/dma_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/eth_defs.h [moved from include/asm-cris/arch-v32/hwregs/eth_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/extmem_defs.h [moved from include/asm-cris/arch-v32/hwregs/extmem_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/Makefile [moved from include/asm-cris/arch-v32/hwregs/iop/Makefile with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_crc_par_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/iop/asm/iop_crc_par_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_dmc_in_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_in_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_dmc_out_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_out_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_in_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_out_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_mpu_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/iop/asm/iop_mpu_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_reg_space_asm.h [moved from include/asm-cris/arch-v32/hwregs/iop/asm/iop_reg_space_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sap_in_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_in_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sap_out_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_out_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_scrc_in_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_in_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_scrc_out_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_out_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_spu_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/iop/asm/iop_spu_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_cfg_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cfg_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_cpu_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cpu_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_mpu_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_mpu_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_spu_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_spu_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_timer_grp_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/iop/asm/iop_timer_grp_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_trigger_grp_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/iop/asm/iop_trigger_grp_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_version_defs_asm.h [moved from include/asm-cris/arch-v32/hwregs/iop/asm/iop_version_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/iop_crc_par_defs.h [moved from include/asm-cris/arch-v32/hwregs/iop/iop_crc_par_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/iop_dmc_in_defs.h [moved from include/asm-cris/arch-v32/hwregs/iop/iop_dmc_in_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/iop_dmc_out_defs.h [moved from include/asm-cris/arch-v32/hwregs/iop/iop_dmc_out_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_in_defs.h [moved from include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_in_extra_defs.h [moved from include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_extra_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_out_defs.h [moved from include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_out_extra_defs.h [moved from include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_extra_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/iop_mpu_defs.h [moved from include/asm-cris/arch-v32/hwregs/iop/iop_mpu_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/iop_mpu_macros.h [moved from include/asm-cris/arch-v32/hwregs/iop/iop_mpu_macros.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/iop_reg_space.h [moved from include/asm-cris/arch-v32/hwregs/iop/iop_reg_space.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/iop_sap_in_defs.h [moved from include/asm-cris/arch-v32/hwregs/iop/iop_sap_in_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/iop_sap_out_defs.h [moved from include/asm-cris/arch-v32/hwregs/iop/iop_sap_out_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/iop_scrc_in_defs.h [moved from include/asm-cris/arch-v32/hwregs/iop/iop_scrc_in_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/iop_scrc_out_defs.h [moved from include/asm-cris/arch-v32/hwregs/iop/iop_scrc_out_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/iop_spu_defs.h [moved from include/asm-cris/arch-v32/hwregs/iop/iop_spu_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_cfg_defs.h [moved from include/asm-cris/arch-v32/hwregs/iop/iop_sw_cfg_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_cpu_defs.h [moved from include/asm-cris/arch-v32/hwregs/iop/iop_sw_cpu_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_mpu_defs.h [moved from include/asm-cris/arch-v32/hwregs/iop/iop_sw_mpu_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_spu_defs.h [moved from include/asm-cris/arch-v32/hwregs/iop/iop_sw_spu_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/iop_timer_grp_defs.h [moved from include/asm-cris/arch-v32/hwregs/iop/iop_timer_grp_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/iop_trigger_grp_defs.h [moved from include/asm-cris/arch-v32/hwregs/iop/iop_trigger_grp_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/iop/iop_version_defs.h [moved from include/asm-cris/arch-v32/hwregs/iop/iop_version_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/irq_nmi_defs.h [moved from include/asm-cris/arch-v32/hwregs/irq_nmi_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/marb_bp_defs.h [moved from include/asm-cris/arch-v32/hwregs/marb_bp_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/marb_defs.h [moved from include/asm-cris/arch-v32/hwregs/marb_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/reg_rdwr.h [moved from include/asm-cris/arch-v32/hwregs/reg_rdwr.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/rt_trace_defs.h [moved from include/asm-cris/arch-v32/hwregs/rt_trace_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/ser_defs.h [moved from include/asm-cris/arch-v32/hwregs/ser_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/sser_defs.h [moved from include/asm-cris/arch-v32/hwregs/sser_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/strcop.h [moved from include/asm-cris/arch-v32/hwregs/strcop.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/strcop_defs.h [moved from include/asm-cris/arch-v32/hwregs/strcop_defs.h with 100% similarity]
arch/cris/include/arch-v32/arch/hwregs/supp_reg.h [moved from include/asm-cris/arch-v32/hwregs/supp_reg.h with 100% similarity]
arch/cris/include/arch-v32/arch/intmem.h [moved from include/asm-cris/arch-v32/intmem.h with 100% similarity]
arch/cris/include/arch-v32/arch/io.h [moved from include/asm-cris/arch-v32/io.h with 98% similarity]
arch/cris/include/arch-v32/arch/irq.h [moved from include/asm-cris/arch-v32/irq.h with 100% similarity]
arch/cris/include/arch-v32/arch/memmap.h [moved from include/asm-cris/arch-v32/memmap.h with 100% similarity]
arch/cris/include/arch-v32/arch/mmu.h [moved from include/asm-cris/arch-v32/mmu.h with 100% similarity]
arch/cris/include/arch-v32/arch/offset.h [moved from include/asm-cris/arch-v32/offset.h with 100% similarity]
arch/cris/include/arch-v32/arch/page.h [moved from include/asm-cris/arch-v32/page.h with 100% similarity]
arch/cris/include/arch-v32/arch/pgtable.h [moved from include/asm-cris/arch-v32/pgtable.h with 100% similarity]
arch/cris/include/arch-v32/arch/processor.h [moved from include/asm-cris/arch-v32/processor.h with 100% similarity]
arch/cris/include/arch-v32/arch/ptrace.h [moved from include/asm-cris/arch-v32/ptrace.h with 100% similarity]
arch/cris/include/arch-v32/arch/spinlock.h [moved from include/asm-cris/arch-v32/spinlock.h with 100% similarity]
arch/cris/include/arch-v32/arch/system.h [moved from include/asm-cris/arch-v32/system.h with 100% similarity]
arch/cris/include/arch-v32/arch/thread_info.h [moved from include/asm-cris/arch-v32/thread_info.h with 100% similarity]
arch/cris/include/arch-v32/arch/timex.h [moved from include/asm-cris/arch-v32/timex.h with 100% similarity]
arch/cris/include/arch-v32/arch/tlb.h [moved from include/asm-cris/arch-v32/tlb.h with 100% similarity]
arch/cris/include/arch-v32/arch/uaccess.h [moved from include/asm-cris/arch-v32/uaccess.h with 100% similarity]
arch/cris/include/arch-v32/arch/unistd.h [moved from include/asm-cris/arch-v32/unistd.h with 100% similarity]
arch/cris/include/arch-v32/arch/user.h [moved from include/asm-cris/arch-v32/user.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/arbiter.h [moved from include/asm-cris/arch-v32/mach-a3/arbiter.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/dma.h [moved from include/asm-cris/arch-v32/mach-a3/dma.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/clkgen_defs_asm.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/asm/clkgen_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/ddr2_defs_asm.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/asm/ddr2_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/gio_defs_asm.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/asm/gio_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/pinmux_defs_asm.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/asm/pinmux_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/pio_defs_asm.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/asm/pio_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/reg_map_asm.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/asm/reg_map_asm.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/timer_defs_asm.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/asm/timer_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/clkgen_defs.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/clkgen_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/ddr2_defs.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/ddr2_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/gio_defs.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/gio_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/intr_vect.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/intr_vect.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/intr_vect_defs.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/intr_vect_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_reg_space_asm.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_reg_space_asm.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sap_in_defs_asm.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sap_in_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sap_out_defs_asm.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sap_out_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_cfg_defs_asm.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sw_cfg_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_cpu_defs_asm.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sw_cpu_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_mpu_defs_asm.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sw_mpu_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_spu_defs_asm.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_sw_spu_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_version_defs_asm.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/iop/asm/iop_version_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_reg_space.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_reg_space.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sap_in_defs.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sap_in_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sap_out_defs.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sap_out_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_cfg_defs.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sw_cfg_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_cpu_defs.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sw_cpu_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_mpu_defs.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sw_mpu_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_spu_defs.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_sw_spu_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_version_defs.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/iop/iop_version_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/l2cache_defs.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/l2cache_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/marb_bar_defs.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/marb_bar_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/marb_foo_defs.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/marb_foo_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/pinmux_defs.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/pinmux_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/pio_defs.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/pio_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/reg_map.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/reg_map.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/strmux_defs.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/strmux_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/hwregs/timer_defs.h [moved from include/asm-cris/arch-v32/mach-a3/hwregs/timer_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/memmap.h [moved from include/asm-cris/arch-v32/mach-a3/memmap.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/pinmux.h [moved from include/asm-cris/arch-v32/mach-a3/pinmux.h with 100% similarity]
arch/cris/include/arch-v32/mach-a3/mach/startup.inc [moved from include/asm-cris/arch-v32/mach-a3/startup.inc with 100% similarity]
arch/cris/include/arch-v32/mach-fs/mach/arbiter.h [moved from include/asm-cris/arch-v32/mach-fs/arbiter.h with 100% similarity]
arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/bif_core_defs_asm.h [moved from include/asm-cris/arch-v32/mach-fs/hwregs/asm/bif_core_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/config_defs_asm.h [moved from include/asm-cris/arch-v32/mach-fs/hwregs/asm/config_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/gio_defs_asm.h [moved from include/asm-cris/arch-v32/mach-fs/hwregs/asm/gio_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/pinmux_defs_asm.h [moved from include/asm-cris/arch-v32/mach-fs/hwregs/asm/pinmux_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/reg_map_asm.h [moved from include/asm-cris/arch-v32/mach-fs/hwregs/asm/reg_map_asm.h with 100% similarity]
arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/timer_defs_asm.h [moved from include/asm-cris/arch-v32/mach-fs/hwregs/asm/timer_defs_asm.h with 100% similarity]
arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_core_defs.h [moved from include/asm-cris/arch-v32/mach-fs/hwregs/bif_core_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_dma_defs.h [moved from include/asm-cris/arch-v32/mach-fs/hwregs/bif_dma_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_slave_defs.h [moved from include/asm-cris/arch-v32/mach-fs/hwregs/bif_slave_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-fs/mach/hwregs/config_defs.h [moved from include/asm-cris/arch-v32/mach-fs/hwregs/config_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-fs/mach/hwregs/gio_defs.h [moved from include/asm-cris/arch-v32/mach-fs/hwregs/gio_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-fs/mach/hwregs/intr_vect.h [moved from include/asm-cris/arch-v32/mach-fs/hwregs/intr_vect.h with 100% similarity]
arch/cris/include/arch-v32/mach-fs/mach/hwregs/intr_vect_defs.h [moved from include/asm-cris/arch-v32/mach-fs/hwregs/intr_vect_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-fs/mach/hwregs/marb_bp_defs.h [moved from include/asm-cris/arch-v32/mach-fs/hwregs/marb_bp_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-fs/mach/hwregs/marb_defs.h [moved from include/asm-cris/arch-v32/mach-fs/hwregs/marb_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-fs/mach/hwregs/pinmux_defs.h [moved from include/asm-cris/arch-v32/mach-fs/hwregs/pinmux_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-fs/mach/hwregs/reg_map.h [moved from include/asm-cris/arch-v32/mach-fs/hwregs/reg_map.h with 100% similarity]
arch/cris/include/arch-v32/mach-fs/mach/hwregs/strmux_defs.h [moved from include/asm-cris/arch-v32/mach-fs/hwregs/strmux_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-fs/mach/hwregs/timer_defs.h [moved from include/asm-cris/arch-v32/mach-fs/hwregs/timer_defs.h with 100% similarity]
arch/cris/include/arch-v32/mach-fs/mach/pinmux.h [moved from include/asm-cris/arch-v32/mach-fs/pinmux.h with 100% similarity]
arch/cris/include/arch-v32/mach-fs/mach/startup.inc [moved from include/asm-cris/arch-v32/mach-fs/startup.inc with 100% similarity]
arch/cris/include/asm/Kbuild [moved from include/asm-cris/Kbuild with 100% similarity]
arch/cris/include/asm/atomic.h [moved from include/asm-cris/atomic.h with 99% similarity]
arch/cris/include/asm/auxvec.h [moved from include/asm-cris/auxvec.h with 100% similarity]
arch/cris/include/asm/axisflashmap.h [moved from include/asm-cris/axisflashmap.h with 100% similarity]
arch/cris/include/asm/bitops.h [moved from include/asm-cris/bitops.h with 99% similarity]
arch/cris/include/asm/bug.h [moved from include/asm-cris/bug.h with 64% similarity]
arch/cris/include/asm/bugs.h [moved from include/asm-cris/bugs.h with 100% similarity]
arch/cris/include/asm/byteorder.h [moved from include/asm-cris/byteorder.h with 94% similarity]
arch/cris/include/asm/cache.h [moved from include/asm-cris/cache.h with 71% similarity]
arch/cris/include/asm/cacheflush.h [moved from include/asm-cris/cacheflush.h with 100% similarity]
arch/cris/include/asm/checksum.h [moved from include/asm-cris/checksum.h with 98% similarity]
arch/cris/include/asm/cputime.h [moved from include/asm-cris/cputime.h with 100% similarity]
arch/cris/include/asm/current.h [moved from include/asm-cris/current.h with 100% similarity]
arch/cris/include/asm/delay.h [moved from include/asm-cris/delay.h with 94% similarity]
arch/cris/include/asm/device.h [moved from include/asm-cris/device.h with 100% similarity]
arch/cris/include/asm/div64.h [moved from include/asm-cris/div64.h with 100% similarity]
arch/cris/include/asm/dma-mapping.h [moved from include/asm-cris/dma-mapping.h with 100% similarity]
arch/cris/include/asm/dma.h [moved from include/asm-cris/dma.h with 93% similarity]
arch/cris/include/asm/elf.h [moved from include/asm-cris/elf.h with 99% similarity]
arch/cris/include/asm/emergency-restart.h [moved from include/asm-cris/emergency-restart.h with 100% similarity]
arch/cris/include/asm/errno.h [moved from include/asm-cris/errno.h with 100% similarity]
arch/cris/include/asm/eshlibld.h [moved from include/asm-cris/eshlibld.h with 100% similarity]
arch/cris/include/asm/ethernet.h [moved from include/asm-cris/ethernet.h with 100% similarity]
arch/cris/include/asm/etraxgpio.h [moved from include/asm-cris/etraxgpio.h with 100% similarity]
arch/cris/include/asm/etraxi2c.h [moved from include/asm-cris/etraxi2c.h with 100% similarity]
arch/cris/include/asm/fasttimer.h [moved from include/asm-cris/fasttimer.h with 100% similarity]
arch/cris/include/asm/fb.h [moved from include/asm-cris/fb.h with 100% similarity]
arch/cris/include/asm/fcntl.h [moved from include/asm-cris/fcntl.h with 100% similarity]
arch/cris/include/asm/futex.h [moved from include/asm-cris/futex.h with 100% similarity]
arch/cris/include/asm/hardirq.h [moved from include/asm-cris/hardirq.h with 100% similarity]
arch/cris/include/asm/hw_irq.h [moved from include/asm-cris/hw_irq.h with 100% similarity]
arch/cris/include/asm/io.h [moved from include/asm-cris/io.h with 99% similarity]
arch/cris/include/asm/ioctl.h [moved from include/asm-cris/ioctl.h with 100% similarity]
arch/cris/include/asm/ioctls.h [moved from include/asm-cris/ioctls.h with 100% similarity]
arch/cris/include/asm/ipcbuf.h [moved from include/asm-cris/ipcbuf.h with 100% similarity]
arch/cris/include/asm/irq.h [moved from include/asm-cris/irq.h with 83% similarity]
arch/cris/include/asm/irq_regs.h [moved from include/asm-cris/irq_regs.h with 100% similarity]
arch/cris/include/asm/kdebug.h [moved from include/asm-cris/kdebug.h with 100% similarity]
arch/cris/include/asm/kmap_types.h [moved from include/asm-cris/kmap_types.h with 100% similarity]
arch/cris/include/asm/linkage.h [moved from include/asm-cris/linkage.h with 100% similarity]
arch/cris/include/asm/local.h [moved from include/asm-cris/local.h with 100% similarity]
arch/cris/include/asm/mman.h [moved from include/asm-cris/mman.h with 100% similarity]
arch/cris/include/asm/mmu.h [moved from include/asm-cris/mmu.h with 78% similarity]
arch/cris/include/asm/mmu_context.h [moved from include/asm-cris/mmu_context.h with 100% similarity]
arch/cris/include/asm/module.h [moved from include/asm-cris/module.h with 100% similarity]
arch/cris/include/asm/msgbuf.h [moved from include/asm-cris/msgbuf.h with 100% similarity]
arch/cris/include/asm/mutex.h [moved from include/asm-cris/mutex.h with 100% similarity]
arch/cris/include/asm/page.h [moved from include/asm-cris/page.h with 98% similarity]
arch/cris/include/asm/param.h [moved from include/asm-cris/param.h with 100% similarity]
arch/cris/include/asm/pci.h [moved from include/asm-cris/pci.h with 100% similarity]
arch/cris/include/asm/percpu.h [moved from include/asm-cris/percpu.h with 100% similarity]
arch/cris/include/asm/pgalloc.h [moved from include/asm-cris/pgalloc.h with 100% similarity]
arch/cris/include/asm/pgtable.h [moved from include/asm-cris/pgtable.h with 99% similarity]
arch/cris/include/asm/poll.h [moved from include/asm-cris/poll.h with 100% similarity]
arch/cris/include/asm/posix_types.h [moved from include/asm-cris/posix_types.h with 100% similarity]
arch/cris/include/asm/processor.h [moved from include/asm-cris/processor.h with 98% similarity]
arch/cris/include/asm/ptrace.h [moved from include/asm-cris/ptrace.h with 91% similarity]
arch/cris/include/asm/resource.h [moved from include/asm-cris/resource.h with 100% similarity]
arch/cris/include/asm/rs485.h [moved from include/asm-cris/rs485.h with 100% similarity]
arch/cris/include/asm/rtc.h [moved from include/asm-cris/rtc.h with 100% similarity]
arch/cris/include/asm/scatterlist.h [moved from include/asm-cris/scatterlist.h with 100% similarity]
arch/cris/include/asm/sections.h [moved from include/asm-cris/sections.h with 100% similarity]
arch/cris/include/asm/segment.h [moved from include/asm-cris/segment.h with 100% similarity]
arch/cris/include/asm/sembuf.h [moved from include/asm-cris/sembuf.h with 100% similarity]
arch/cris/include/asm/setup.h [moved from include/asm-cris/setup.h with 100% similarity]
arch/cris/include/asm/shmbuf.h [moved from include/asm-cris/shmbuf.h with 100% similarity]
arch/cris/include/asm/shmparam.h [moved from include/asm-cris/shmparam.h with 100% similarity]
arch/cris/include/asm/sigcontext.h [moved from include/asm-cris/sigcontext.h with 100% similarity]
arch/cris/include/asm/siginfo.h [moved from include/asm-cris/siginfo.h with 100% similarity]
arch/cris/include/asm/signal.h [moved from include/asm-cris/signal.h with 100% similarity]
arch/cris/include/asm/smp.h [moved from include/asm-cris/smp.h with 100% similarity]
arch/cris/include/asm/socket.h [moved from include/asm-cris/socket.h with 100% similarity]
arch/cris/include/asm/sockios.h [moved from include/asm-cris/sockios.h with 100% similarity]
arch/cris/include/asm/spinlock.h [new file with mode: 0644]
arch/cris/include/asm/stat.h [moved from include/asm-cris/stat.h with 100% similarity]
arch/cris/include/asm/statfs.h [moved from include/asm-cris/statfs.h with 100% similarity]
arch/cris/include/asm/string.h [moved from include/asm-cris/string.h with 100% similarity]
arch/cris/include/asm/sync_serial.h [moved from include/asm-cris/sync_serial.h with 100% similarity]
arch/cris/include/asm/system.h [moved from include/asm-cris/system.h with 98% similarity]
arch/cris/include/asm/termbits.h [moved from include/asm-cris/termbits.h with 100% similarity]
arch/cris/include/asm/termios.h [moved from include/asm-cris/termios.h with 100% similarity]
arch/cris/include/asm/thread_info.h [moved from include/asm-cris/thread_info.h with 98% similarity]
arch/cris/include/asm/timex.h [moved from include/asm-cris/timex.h with 92% similarity]
arch/cris/include/asm/tlb.h [moved from include/asm-cris/tlb.h with 93% similarity]
arch/cris/include/asm/tlbflush.h [moved from include/asm-cris/tlbflush.h with 100% similarity]
arch/cris/include/asm/topology.h [moved from include/asm-cris/topology.h with 100% similarity]
arch/cris/include/asm/types.h [moved from include/asm-cris/types.h with 100% similarity]
arch/cris/include/asm/uaccess.h [moved from include/asm-cris/uaccess.h with 99% similarity]
arch/cris/include/asm/ucontext.h [moved from include/asm-cris/ucontext.h with 100% similarity]
arch/cris/include/asm/unaligned.h [moved from include/asm-cris/unaligned.h with 100% similarity]
arch/cris/include/asm/unistd.h [moved from include/asm-cris/unistd.h with 99% similarity]
arch/cris/include/asm/user.h [moved from include/asm-cris/user.h with 98% similarity]
arch/cris/kernel/asm-offsets.c [moved from arch/cris/arch-v32/kernel/asm-offsets.c with 55% similarity]
arch/cris/kernel/vmlinux.lds.S [moved from arch/cris/arch-v32/vmlinux.lds.S with 73% similarity]
arch/cris/mm/ioremap.c
arch/ia64/kernel/perfmon.c
arch/powerpc/boot/addnote.c
arch/powerpc/boot/dts/mpc8313erdb.dts
arch/powerpc/boot/libfdt/fdt_ro.c
arch/powerpc/boot/main.c
arch/powerpc/boot/wrapper
arch/powerpc/configs/40x/acadia_defconfig
arch/powerpc/configs/40x/ep405_defconfig
arch/powerpc/configs/40x/hcu4_defconfig
arch/powerpc/configs/40x/kilauea_defconfig
arch/powerpc/configs/40x/makalu_defconfig
arch/powerpc/configs/40x/walnut_defconfig
arch/powerpc/configs/44x/arches_defconfig
arch/powerpc/configs/44x/bamboo_defconfig
arch/powerpc/configs/44x/canyonlands_defconfig
arch/powerpc/configs/44x/ebony_defconfig
arch/powerpc/configs/44x/katmai_defconfig
arch/powerpc/configs/44x/rainier_defconfig
arch/powerpc/configs/44x/sam440ep_defconfig
arch/powerpc/configs/44x/sequoia_defconfig
arch/powerpc/configs/44x/taishan_defconfig
arch/powerpc/configs/44x/warp_defconfig
arch/powerpc/configs/linkstation_defconfig
arch/powerpc/configs/ppc40x_defconfig
arch/powerpc/configs/ppc44x_defconfig
arch/powerpc/include/asm/iommu.h
arch/powerpc/include/asm/kdump.h
arch/powerpc/include/asm/mpic.h
arch/powerpc/include/asm/pci.h
arch/powerpc/kernel/dma-iommu.c
arch/powerpc/kernel/head_64.S
arch/powerpc/kernel/ibmebus.c
arch/powerpc/kernel/iommu.c
arch/powerpc/kernel/machine_kexec_64.c
arch/powerpc/kernel/misc_64.S
arch/powerpc/kernel/of_device.c
arch/powerpc/kernel/pci-common.c
arch/powerpc/kernel/pci_64.c
arch/powerpc/kernel/prom_init.c
arch/powerpc/kernel/setup_64.c
arch/powerpc/kernel/signal_32.c
arch/powerpc/kernel/signal_64.c
arch/powerpc/kernel/vio.c
arch/powerpc/kernel/vmlinux.lds.S
arch/powerpc/oprofile/op_model_cell.c
arch/powerpc/platforms/40x/Kconfig
arch/powerpc/platforms/85xx/mpc85xx_ds.c
arch/powerpc/platforms/86xx/pic.c
arch/powerpc/platforms/cell/iommu.c
arch/powerpc/platforms/cell/ras.c
arch/powerpc/platforms/embedded6xx/linkstation.c
arch/powerpc/platforms/iseries/iommu.c
arch/powerpc/platforms/ps3/system-bus.c
arch/powerpc/platforms/pseries/iommu.c
arch/powerpc/platforms/pseries/pci_dlpar.c
arch/powerpc/sysdev/fsl_soc.c
arch/powerpc/sysdev/mpic.c
arch/powerpc/xmon/xmon.c
arch/sh/Kconfig
arch/sh/Makefile
arch/sh/boot/compressed/Makefile_32
arch/sh/cchips/Kconfig
arch/sh/cchips/hd6446x/Makefile
arch/sh/cchips/hd6446x/hd64465/Makefile [deleted file]
arch/sh/cchips/hd6446x/hd64465/gpio.c [deleted file]
arch/sh/cchips/hd6446x/hd64465/io.c [deleted file]
arch/sh/cchips/hd6446x/hd64465/setup.c [deleted file]
arch/sh/configs/migor_defconfig
arch/sh/configs/ul2_defconfig [new file with mode: 0644]
arch/sh/include/asm/byteorder.h
arch/sh/include/asm/hd64465/gpio.h [deleted file]
arch/sh/include/asm/hd64465/hd64465.h [deleted file]
arch/sh/include/asm/hd64465/io.h [deleted file]
arch/sh/include/asm/serial.h
arch/sh/include/cpu-sh4/cpu/rtc.h
arch/sh/kernel/cpu/sh4a/setup-sh7366.c
arch/sh/kernel/cpu/sh4a/setup-sh7722.c
arch/sh/kernel/entry-common.S
arch/sh/kernel/sh_ksyms_32.c
arch/sh/mm/cache-sh2a.c
arch/sh/oprofile/op_model_sh7750.c
arch/sh/tools/mach-types
arch/sparc/include/asm/byteorder.h
arch/sparc/include/asm/kdebug_32.h
arch/sparc/include/asm/processor_64.h
arch/sparc/include/asm/uaccess_64.h
arch/sparc/kernel/time.c
arch/sparc64/kernel/pci.c
arch/sparc64/kernel/time.c
arch/sparc64/lib/PeeCeeI.c
arch/x86/include/asm/cpufeature.h
arch/x86/kernel/cpu/common.c
arch/x86/kernel/e820.c
drivers/ata/ata_piix.c
drivers/ata/libata-core.c
drivers/ata/sata_via.c
drivers/bluetooth/bpa10x.c
drivers/cdrom/gdrom.c
drivers/char/hpet.c
drivers/char/ipmi/ipmi_devintf.c
drivers/char/ipmi/ipmi_watchdog.c
drivers/char/random.c
drivers/char/rtc.c
drivers/char/sonypi.c
drivers/gpu/drm/drm_fops.c
drivers/hid/usbhid/hiddev.c
drivers/ieee1394/dv1394.c
drivers/infiniband/core/uverbs_main.c
drivers/input/evdev.c
drivers/input/joydev.c
drivers/input/misc/hp_sdc_rtc.c
drivers/input/mousedev.c
drivers/input/serio/serio_raw.c
drivers/leds/leds-hp-disk.c
drivers/message/fusion/mptctl.c
drivers/message/i2o/i2o_config.c
drivers/mfd/Kconfig
drivers/misc/panasonic-laptop.c
drivers/misc/sony-laptop.c
drivers/net/3c509.c
drivers/net/amd8111e.c
drivers/net/arm/at91_ether.c
drivers/net/atlx/atl1.c
drivers/net/atlx/atl1.h
drivers/net/bonding/bond_alb.c
drivers/net/bonding/bond_main.c
drivers/net/cris/eth_v10.c
drivers/net/gianfar.c
drivers/net/gianfar_mii.c
drivers/net/gianfar_mii.h
drivers/net/irda/ks959-sir.c
drivers/net/irda/ksdazzle-sir.c
drivers/net/loopback.c
drivers/net/myri10ge/myri10ge.c
drivers/net/pppoe.c
drivers/net/smc91x.c
drivers/net/tun.c
drivers/net/wan/z85230.c
drivers/net/wireless/ath5k/base.c
drivers/net/wireless/ath5k/debug.c
drivers/net/wireless/ath5k/initvals.c
drivers/net/wireless/ath5k/reset.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/libertas/cmd.c
drivers/net/wireless/libertas/scan.c
drivers/net/wireless/rt2x00/Kconfig
drivers/of/device.c
drivers/pcmcia/Kconfig
drivers/pcmcia/Makefile
drivers/pcmcia/hd64465_ss.c [deleted file]
drivers/rtc/rtc-dev.c
drivers/rtc/rtc-m48t59.c
drivers/scsi/megaraid/megaraid_sas.c
drivers/scsi/sg.c
drivers/serial/crisv10.c
drivers/serial/crisv10.h
drivers/serial/sh-sci.c
drivers/serial/sh-sci.h
drivers/staging/me4000/me4000.c
drivers/telephony/ixj.c
drivers/uio/uio.c
drivers/usb/gadget/inode.c
drivers/video/cirrusfb.c
fs/ext3/super.c
fs/ext4/balloc.c
fs/ext4/ext4.h
fs/ext4/super.c
fs/file_table.c
fs/fuse/dev.c
fs/inotify_user.c
fs/jbd2/commit.c
fs/lockd/svc4proc.c
fs/lockd/svcproc.c
fs/nfsd/vfs.c
fs/pipe.c
include/asm-cris/arch-v32/arbiter.h [deleted file]
include/asm-cris/arch-v32/hwregs/asm/pinmux_defs_asm.h [deleted file]
include/asm-cris/arch-v32/hwregs/asm/reg_map_asm.h [deleted file]
include/asm-cris/arch-v32/hwregs/gio_defs.h [deleted file]
include/asm-cris/arch-v32/hwregs/intr_vect.h [deleted file]
include/asm-cris/arch-v32/hwregs/pinmux_defs.h [deleted file]
include/asm-cris/arch-v32/hwregs/strmux_defs.h [deleted file]
include/asm-cris/arch-v32/pinmux.h [deleted file]
include/asm-cris/spinlock.h [deleted file]
include/linux/fsl_devices.h
include/linux/libata.h
include/linux/netdevice.h
include/linux/string.h
include/net/net_namespace.h
include/net/sock.h
init/do_mounts_md.c
kernel/power/Kconfig
kernel/resource.c
net/core/net_namespace.c
net/core/skbuff.c
net/ipv4/cipso_ipv4.c
net/ipv4/udp.c
net/ipv6/udp.c
net/key/af_key.c
net/netfilter/nf_conntrack_proto_gre.c
net/netlabel/netlabel_addrlist.c
net/netlabel/netlabel_addrlist.h
net/netlabel/netlabel_mgmt.c
net/socket.c
net/unix/af_unix.c
net/xfrm/xfrm_policy.c
security/commoncap.c
security/selinux/hooks.c
sound/core/control.c
sound/core/init.c
sound/core/pcm_native.c
sound/core/timer.c
sound/oss/dmasound/dmasound.h
sound/oss/dmasound/dmasound_core.c
sound/sparc/dbri.c

index 5482bf5..f035416 100644 (file)
@@ -47,9 +47,7 @@ Next, for companion chips:
     `-- sh
         `-- cchips
             `-- hd6446x
-                |-- hd64461
-                |   `-- cchip-specific files
-                `-- hd64465
+                `-- hd64461
                     `-- cchip-specific files
 
 ... and so on. Headers for the companion chips are treated the same way as
index 43de305..d643e86 100644 (file)
@@ -743,6 +743,8 @@ P:  Nick Kossifidis
 M:     mickflemm@gmail.com
 P:     Luis R. Rodriguez
 M:     mcgrof@gmail.com
+P:     Bob Copeland
+M:     me@bobcopeland.com
 L:     linux-wireless@vger.kernel.org
 L:     ath5k-devel@lists.ath5k.org
 S:     Maintained
index c6f5f5a..3662cfb 100644 (file)
@@ -23,12 +23,17 @@ mach-$(CONFIG_ETRAXFS) := fs
 
 ifneq ($(arch-y),)
 SARCH := arch-$(arch-y)
+inc := -Iarch/cris/include/$(SARCH)
+inc += -Iarch/cris/include/$(SARCH)/arch
 else
 SARCH :=
+inc :=
 endif
 
 ifneq ($(mach-y),)
 MACH := mach-$(mach-y)
+inc += -Iarch/cris/include/$(SARCH)/$(MACH)/
+inc += -Iarch/cris/include/$(SARCH)/$(MACH)/mach
 else
 MACH :=
 endif
@@ -39,95 +44,57 @@ OBJCOPYFLAGS := -O binary -R .note -R .comment -S
 
 CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)
 
-KBUILD_AFLAGS += -mlinux -march=$(arch-y) -Iinclude/asm/arch/mach -Iinclude/asm/arch
-
-KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe -Iinclude/asm/arch/mach -Iinclude/asm/arch
+KBUILD_AFLAGS += -mlinux -march=$(arch-y) $(inc)
+KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe $(inc)
+KBUILD_CPPFLAGS += $(inc)
 
 ifdef CONFIG_FRAME_POINTER
 KBUILD_CFLAGS := $(subst -fomit-frame-pointer,,$(KBUILD_CFLAGS)) -g
 KBUILD_CFLAGS += -fno-omit-frame-pointer
 endif
 
-head-y := arch/$(ARCH)/$(SARCH)/kernel/head.o
+head-y := arch/cris/$(SARCH)/kernel/head.o
 
 LIBGCC = $(shell $(CC) $(KBUILD_CFLAGS) -print-file-name=libgcc.a)
 
-core-y         += arch/$(ARCH)/kernel/ arch/$(ARCH)/mm/
-core-y         += arch/$(ARCH)/$(SARCH)/kernel/ arch/$(ARCH)/$(SARCH)/mm/
+core-y         += arch/cris/kernel/ arch/cris/mm/
+core-y         += arch/cris/$(SARCH)/kernel/ arch/cris/$(SARCH)/mm/
 ifdef CONFIG_ETRAX_ARCH_V32
-core-y         += arch/$(ARCH)/$(SARCH)/$(MACH)/
+core-y         += arch/cris/$(SARCH)/$(MACH)/
 endif
-drivers-y      += arch/$(ARCH)/$(SARCH)/drivers/
-libs-y         += arch/$(ARCH)/$(SARCH)/lib/ $(LIBGCC)
+drivers-y      += arch/cris/$(SARCH)/drivers/
+libs-y         += arch/cris/$(SARCH)/lib/ $(LIBGCC)
 
 # cris source path
-SRC_ARCH              = $(srctree)/arch/$(ARCH)
+SRC_ARCH              = $(srctree)/arch/cris
 # cris object files path
-OBJ_ARCH              = $(objtree)/arch/$(ARCH)
+OBJ_ARCH              = $(objtree)/arch/cris
 
-boot := arch/$(ARCH)/boot
-MACHINE := arch/$(ARCH)/$(SARCH)
+boot := arch/cris/$(SARCH)/boot
+MACHINE := arch/cris/$(SARCH)
 
 all: zImage
 
 zImage Image: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
 
-archprepare: $(SRC_ARCH)/.links $(srctree)/include/asm-$(ARCH)/.arch FORCE
-
-# Create some links to make all tools happy
-$(SRC_ARCH)/.links:
-       @rm -rf $(SRC_ARCH)/drivers
-       @ln -sfn $(SARCH)/drivers $(SRC_ARCH)/drivers
-       @rm -rf $(SRC_ARCH)/boot
-       @ln -sfn $(SARCH)/boot $(SRC_ARCH)/boot
-       @rm -rf $(SRC_ARCH)/lib
-       @ln -sfn $(SARCH)/lib $(SRC_ARCH)/lib
-       @rm -f $(SRC_ARCH)/arch/mach
-       @rm -rf $(SRC_ARCH)/arch
-       @ln -sfn $(SARCH) $(SRC_ARCH)/arch
-ifdef CONFIG_ETRAX_ARCH_V32
-       @ln -sfn ../$(SARCH)/$(MACH) $(SRC_ARCH)/arch/mach
-endif
-       @rm -rf $(SRC_ARCH)/kernel/vmlinux.lds.S
-       @ln -sfn ../$(SARCH)/vmlinux.lds.S $(SRC_ARCH)/kernel/vmlinux.lds.S
-       @rm -rf $(SRC_ARCH)/kernel/asm-offsets.c
-       @ln -sfn ../$(SARCH)/kernel/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c
-       @touch $@
-
-# Create link to sub arch includes
-$(srctree)/include/asm-$(ARCH)/.arch: $(wildcard include/config/arch/*.h)
-       @echo '  SYMLINK include/asm-$(ARCH)/arch -> include/asm-$(ARCH)/$(SARCH)'
-       @rm -f $(srctree)/include/asm-$(ARCH)/arch/mach
-       @rm -f $(srctree)/include/asm-$(ARCH)/arch
-       @ln -sf $(SARCH) $(srctree)/include/asm-$(ARCH)/arch
-ifdef CONFIG_ETRAX_ARCH_V32
-       @ln -sf $(MACH) $(srctree)/include/asm-$(ARCH)/arch/mach
-endif
-       @touch $@
+archprepare:
 
 archclean:
-       $(Q)if [ -e arch/$(ARCH)/boot ]; then \
-               $(MAKE) $(clean)=arch/$(ARCH)/boot; \
+       $(Q)if [ -e arch/cris/$(SARCH)/boot ]; then \
+               $(MAKE) $(clean)=arch/cris/$(SARCH)/boot; \
        fi
 
 CLEAN_FILES += \
        $(MACHINE)/boot/zImage \
        $(MACHINE)/boot/compressed/decompress.bin \
        $(MACHINE)/boot/compressed/piggy.gz \
-       $(MACHINE)/boot/rescue/rescue.bin \
-       $(SRC_ARCH)/.links \
-       $(srctree)/include/asm-$(ARCH)/.arch
-
-MRPROPER_FILES += \
-       $(SRC_ARCH)/drivers \
-       $(SRC_ARCH)/boot \
-       $(SRC_ARCH)/lib \
-       $(SRC_ARCH)/arch \
-       $(SRC_ARCH)/kernel/vmlinux.lds.S \
-       $(SRC_ARCH)/kernel/asm-offsets.c
+       $(MACHINE)/boot/rescue/rescue.bin
+
+
+# MRPROPER_FILES +=
 
 define archhelp
-  echo  '* zImage        - Compressed kernel image (arch/$(ARCH)/boot/zImage)'
-  echo  '* Image         - Uncompressed kernel image (arch/$(ARCH)/boot/Image)'
+  echo  '* zImage        - Compressed kernel image (arch/cris/boot/zImage)'
+  echo  '* Image         - Uncompressed kernel image (arch/cris/boot/Image)'
 endef
diff --git a/arch/cris/arch-v10/boot/.gitignore b/arch/cris/arch-v10/boot/.gitignore
new file mode 100644 (file)
index 0000000..171a085
--- /dev/null
@@ -0,0 +1,2 @@
+Image
+zImage
index 981fbae..0bb4dcc 100644 (file)
@@ -9,7 +9,7 @@
  */
 
 #define ASSEMBLER_MACROS_ONLY
-#include <asm/arch/sv_addr_ag.h>
+#include <arch/sv_addr_ag.h>
 
 #define RAM_INIT_MAGIC 0x56902387
 #define COMMAND_LINE_MAGIC 0x87109563
index d933c89..a4db150 100644 (file)
@@ -20,7 +20,7 @@
 
 
 #include <linux/types.h>
-#include <asm/arch/svinto.h>
+#include <arch/svinto.h>
 
 /*
  * gzip declarations
index 6ba7be8..fb503d1 100644 (file)
@@ -65,7 +65,7 @@
 #ifdef CONFIG_ETRAX_AXISFLASHMAP
 
 #define ASSEMBLER_MACROS_ONLY
-#include <asm/arch/sv_addr_ag.h>
+#include <arch/sv_addr_ag.h>
 
        ;; The partitiontable is looked for at the first sector after the boot
        ;; sector. Sector size is 65536 bytes in all flashes we use.
index 55eeff8..6f7b3e6 100644 (file)
@@ -6,7 +6,7 @@
  */
 
 #define ASSEMBLER_MACROS_ONLY
-#include <asm/arch/sv_addr_ag.h>
+#include <arch/sv_addr_ag.h>
 
 #define CODE_START 0x40004000
 #define CODE_LENGTH 784
index 2d937f9..fc7ec67 100644 (file)
@@ -6,7 +6,7 @@
  */
 
 #define ASSEMBLER_MACROS_ONLY
-#include <asm/arch/sv_addr_ag.h>
+#include <arch/sv_addr_ag.h>
 
        .text
 
index b3bdda9..b207970 100644 (file)
@@ -26,7 +26,7 @@
 
 #include <asm/axisflashmap.h>
 #include <asm/mmu.h>
-#include <asm/arch/sv_addr_ag.h>
+#include <arch/sv_addr_ag.h>
 
 #ifdef CONFIG_CRIS_LOW_MAP
 #define FLASH_UNCACHED_ADDR  KSEG_8
index 3bdfaf4..77630df 100644 (file)
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/arch/svinto.h>
+#include <arch/svinto.h>
 #include <asm/io.h>
 #include <asm/rtc.h>
-#include <asm/arch/io_interface_mux.h>
+#include <arch/io_interface_mux.h>
 
 #include "i2c.h"
 
index 86048e6..4b0f65f 100644 (file)
 #include <linux/interrupt.h>
 
 #include <asm/etraxgpio.h>
-#include <asm/arch/svinto.h>
+#include <arch/svinto.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/irq.h>
-#include <asm/arch/io_interface_mux.h>
+#include <arch/io_interface_mux.h>
 
 #define GPIO_MAJOR 120  /* experimental MAJOR number */
 
index 2797e67..7f656ae 100644 (file)
 #include <asm/etraxi2c.h>
 
 #include <asm/system.h>
-#include <asm/arch/svinto.h>
+#include <arch/svinto.h>
 #include <asm/io.h>
 #include <asm/delay.h>
-#include <asm/arch/io_interface_mux.h>
+#include <arch/io_interface_mux.h>
 
 #include "i2c.h"
 
index 91fea62..6cc1a03 100644 (file)
 #include <asm/irq.h>
 #include <asm/dma.h>
 #include <asm/io.h>
-#include <asm/arch/svinto.h>
+#include <arch/svinto.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/sync_serial.h>
-#include <asm/arch/io_interface_mux.h>
+#include <arch/io_interface_mux.h>
 
 /* The receiver is a bit tricky beacuse of the continuous stream of data.*/
 /*                                                                       */
diff --git a/arch/cris/arch-v10/kernel/asm-offsets.c b/arch/cris/arch-v10/kernel/asm-offsets.c
deleted file mode 100644 (file)
index 1aa3cc4..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#include <linux/sched.h>
-#include <asm/thread_info.h>
-
-/*
- * Generate definitions needed by assembly language modules.
- * This code generates raw asm output which is post-processed to extract
- * and format the required data.
- */
-
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
-int main(void)
-{
-#define ENTRY(entry) DEFINE(PT_ ## entry, offsetof(struct pt_regs, entry))
-       ENTRY(orig_r10);
-       ENTRY(r13); 
-       ENTRY(r12); 
-       ENTRY(r11);
-        ENTRY(r10);
-        ENTRY(r9);
-        ENTRY(mof);
-        ENTRY(dccr);
-        ENTRY(srp);
-       BLANK();
-#undef ENTRY
-#define ENTRY(entry) DEFINE(TI_ ## entry, offsetof(struct thread_info, entry))
-        ENTRY(task);
-        ENTRY(flags);
-        ENTRY(preempt_count);
-        BLANK();
-#undef ENTRY
-#define ENTRY(entry) DEFINE(THREAD_ ## entry, offsetof(struct thread_struct, entry))
-       ENTRY(ksp);
-        ENTRY(usp);
-        ENTRY(dccr);
-        BLANK();
-#undef ENTRY
-#define ENTRY(entry) DEFINE(TASK_ ## entry, offsetof(struct task_struct, entry))
-        ENTRY(pid);
-        BLANK();
-        DEFINE(LCLONE_VM, CLONE_VM);
-        DEFINE(LCLONE_UNTRACED, CLONE_UNTRACED);
-        return 0;
-}
index e6b8013..1ca6fc2 100644 (file)
@@ -1,6 +1,6 @@
 #include <linux/module.h>
 #include <asm/io.h>
-#include <asm/arch/svinto.h>
+#include <arch/svinto.h>
 
 /* Export shadow registers for the CPU I/O pins */
 EXPORT_SYMBOL(genconfig_shadow);
index 3dc6e91..99851ba 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/delay.h>
 #include <linux/tty.h>
 #include <asm/system.h>
-#include <asm/arch/svinto.h>
+#include <arch/svinto.h>
 #include <asm/io.h>             /* Get SIMCOUT. */
 
 extern void reset_watchdog(void);
index eb1fa0d..929e686 100644 (file)
@@ -7,7 +7,7 @@
 #include <linux/errno.h>
 
 #include <asm/dma.h>
-#include <asm/arch/svinto.h>
+#include <arch/svinto.h>
 
 /* Macro to access ETRAX 100 registers */
 #define SETS(var, reg, field, val) var = (var & ~IO_MASK_(reg##_, field##_)) | \
index 3a65f32..ed171d3 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/linkage.h>
 #include <linux/sys.h>
 #include <asm/unistd.h>
-#include <asm/arch/sv_addr_ag.h>
+#include <arch/sv_addr_ag.h>
 #include <asm/errno.h>
 #include <asm/thread_info.h>
 #include <asm/asm-offsets.h>
index 31ff35c..5ff08a8 100644 (file)
@@ -24,7 +24,7 @@
 #include <asm/rtc.h>
 
 
-#include <asm/arch/svinto.h>
+#include <arch/svinto.h>
 #include <asm/fasttimer.h>
 #include <linux/proc_fs.h>
 
index 96344af..fc45771 100644 (file)
@@ -10,7 +10,7 @@
 #define ASSEMBLER_MACROS_ONLY
 /* The IO_* macros use the ## token concatenation operator, so
    -traditional must not be used when assembling this file.  */
-#include <asm/arch/sv_addr_ag.h>
+#include <arch/sv_addr_ag.h>
 
 #define CRAMFS_MAGIC 0x28cd3d45
 #define RAM_INIT_MAGIC 0x56902387
index add98e0..29f97e9 100644 (file)
@@ -11,9 +11,9 @@
 #include <linux/module.h>
 #include <linux/init.h>
 
-#include <asm/arch/svinto.h>
+#include <arch/svinto.h>
 #include <asm/io.h>
-#include <asm/arch/io_interface_mux.h>
+#include <arch/io_interface_mux.h>
 
 
 #define DBG(s)
index 6fea45f..b9f9c8c 100644 (file)
 #include <asm/setup.h>
 #include <asm/ptrace.h>
 
-#include <asm/arch/svinto.h>
+#include <arch/svinto.h>
 #include <asm/irq.h>
 
 static int kgdb_started = 0;
index 53117f0..bd9b3ff 100644 (file)
@@ -14,7 +14,7 @@
 #include <linux/err.h>
 #include <linux/fs.h>
 #include <linux/slab.h>
-#include <asm/arch/svinto.h>
+#include <arch/svinto.h>
 #include <linux/init.h>
 
 #ifdef CONFIG_ETRAX_GPIO
index 525483f..c685ba4 100644 (file)
@@ -14,7 +14,7 @@
 #include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/mm.h>
-#include <asm/arch/svinto.h>
+#include <arch/svinto.h>
 #include <asm/types.h>
 #include <asm/signal.h>
 #include <asm/io.h>
index 9eada5d..8bebb96 100644 (file)
@@ -10,7 +10,7 @@
 
 #include <linux/ptrace.h>
 #include <asm/uaccess.h>
-#include <asm/arch/sv_addr_ag.h>
+#include <arch/sv_addr_ag.h>
 
 void
 show_registers(struct pt_regs *regs)
index 65504fd..087a209 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/mm.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
-#include <asm/arch/svinto.h>
+#include <arch/svinto.h>
 #include <asm/mmu_context.h>
 
 /* debug of low-level TLB reload */
index 742fd19..baa746c 100644 (file)
@@ -12,7 +12,7 @@
 #include <asm/mmu.h>
 #include <asm/io.h>
 #include <asm/mmu_context.h>
-#include <asm/arch/svinto.h>
+#include <arch/svinto.h>
 
 extern void tlb_init(void);
 
index 6baf5bd..4a496e4 100644 (file)
@@ -12,7 +12,7 @@
 
 #include <asm/tlb.h>
 #include <asm/mmu_context.h>
-#include <asm/arch/svinto.h>
+#include <arch/svinto.h>
 
 #define D(x)
 
diff --git a/arch/cris/arch-v10/vmlinux.lds.S b/arch/cris/arch-v10/vmlinux.lds.S
deleted file mode 100644 (file)
index 93c9f0e..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-/* ld script to make the Linux/CRIS kernel
- * Authors: Bjorn Wesen (bjornw@axis.com)
- *
- * It is VERY DANGEROUS to fiddle around with the symbols in this
- * script. It is for example quite vital that all generated sections
- * that are used are actually named here, otherwise the linker will
- * put them at the end, where the init stuff is which is FREED after
- * the kernel has booted. 
- */    
-
-#include <asm-generic/vmlinux.lds.h>
-#include <asm/page.h>
-
-jiffies = jiffies_64;
-SECTIONS
-{
-       . = DRAM_VIRTUAL_BASE;
-       dram_start = .;
-       ibr_start = .;
-       . = . + 0x4000; /* see head.S and pages reserved at the start */
-
-       _text = .;                    /* Text and read-only data */
-       text_start = .;              /* lots of aliases */
-       _stext = .;
-       __stext = .;
-       .text : {
-               TEXT_TEXT
-               SCHED_TEXT
-               LOCK_TEXT
-               *(.fixup)
-               *(.text.__*)
-       }
-
-       _etext = . ;                  /* End of text section */ 
-       __etext = .;
-
-       . = ALIGN(4);                /* Exception table */
-       __start___ex_table = .;
-       __ex_table : { *(__ex_table) }
-       __stop___ex_table = .;
-
-       RODATA
-
-       . = ALIGN (4);
-       ___data_start = . ;
-       __Sdata = . ;
-       .data : {                     /* Data */
-               DATA_DATA
-       }
-       __edata = . ;                 /* End of data section */
-       _edata = . ;
-
-       . = ALIGN(PAGE_SIZE);   /* init_task and stack, must be aligned */
-       .data.init_task : { *(.data.init_task) }
-
-       . = ALIGN(PAGE_SIZE);   /* Init code and data */
-       __init_begin = .;
-       .init.text : { 
-                  _sinittext = .;
-                  INIT_TEXT
-                  _einittext = .;
-       }
-       .init.data : { INIT_DATA }
-       . = ALIGN(16);
-       __setup_start = .;
-       .init.setup : { *(.init.setup) }
-       __setup_end = .;
-       .initcall.init : {
-               __initcall_start = .;
-               INITCALLS
-               __initcall_end = .;     
-       }
-
-       .con_initcall.init : {
-               __con_initcall_start = .;
-               *(.con_initcall.init)
-               __con_initcall_end = .;
-       }       
-       SECURITY_INIT
-
-#ifdef CONFIG_BLK_DEV_INITRD
-       .init.ramfs : {
-               __initramfs_start = .;
-               *(.init.ramfs)
-               __initramfs_end = .;
-       }
-#endif
-       __vmlinux_end = .;            /* last address of the physical file */
-
-       /*
-        * We fill to the next page, so we can discard all init
-        * pages without needing to consider what payload might be
-        * appended to the kernel image.
-        */
-       . = ALIGN(PAGE_SIZE);
-
-       __init_end = .;
-
-       __data_end = . ;              /* Move to _edata ? */
-       __bss_start = .;              /* BSS */
-       .bss : {
-               *(COMMON)
-               *(.bss)
-       }
-
-       . =  ALIGN (0x20);
-       _end = .;
-       __end = .;
-
-       /* Sections to be discarded */
-       /DISCARD/ : {
-               EXIT_TEXT
-               EXIT_DATA
-               *(.exitcall.exit)
-        }
-
-       dram_end = dram_start + CONFIG_ETRAX_DRAM_SIZE*1024*1024;
-}
index f86208c..a4a65c5 100644 (file)
@@ -7,7 +7,7 @@
 
 #define ASSEMBLER_MACROS_ONLY
 #include <hwregs/asm/reg_map_asm.h>
-#include <asm/arch/mach/startup.inc>
+#include <mach/startup.inc>
 
 #define RAM_INIT_MAGIC 0x56902387
 #define COMMAND_LINE_MAGIC 0x87109563
@@ -17,7 +17,7 @@
        .globl  input_data
 
        .text
-start:
+_start:
        di
 
        ;; Start clocks for used blocks.
@@ -28,7 +28,13 @@ start:
        beq     dram_init_finished
        nop
 
-#include "../../mach/dram_init.S"
+#if defined CONFIG_ETRAXFS
+#include "../../mach-fs/dram_init.S"
+#elif defined CONFIG_CRIS_MACH_ARTPEC3
+#include "../../mach-a3/dram_init.S"
+#else
+#error Only ETRAXFS and ARTPEC-3 supported!
+#endif
 
 dram_init_finished:
 
@@ -130,4 +136,10 @@ _cmd_line_addr:
 _boot_source:
        .dword 0
 
-#include "../../mach/hw_settings.S"
+#if defined CONFIG_ETRAXFS
+#include "../../mach-fs/hw_settings.S"
+#elif defined CONFIG_CRIS_MACH_ARTPEC3
+#include "../../mach-a3/hw_settings.S"
+#else
+#error Only ETRAXFS and ARTPEC-3 supported!
+#endif
index ef98608..7a87bc0 100644 (file)
@@ -33,7 +33,7 @@
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/irq.h>
-#include <asm/arch/mach/pinmux.h>
+#include <mach/pinmux.h>
 
 #ifdef CONFIG_ETRAX_VIRTUAL_GPIO
 #include "../i2c.h"
index 01ed0be..25d6f2b 100644 (file)
@@ -18,7 +18,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
-#include <asm/arch/memmap.h>
+#include <arch/memmap.h>
 #include <hwregs/reg_map.h>
 #include <hwregs/reg_rdwr.h>
 #include <hwregs/pio_defs.h>
index aa01b13..c5a0f54 100644 (file)
@@ -18,7 +18,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
-#include <asm/arch/memmap.h>
+#include <arch/memmap.h>
 #include <hwregs/reg_map.h>
 #include <hwregs/reg_rdwr.h>
 #include <hwregs/gio_defs.h>
index 5b79a7a..77ee319 100644 (file)
@@ -1,6 +1,6 @@
 #include <linux/pci.h>
 #include <linux/kernel.h>
-#include <asm/arch/hwregs/intr_vect.h>
+#include <arch/hwregs/intr_vect.h>
 
 void __devinit  pcibios_fixup_bus(struct pci_bus *b)
 {
index 80da7b8..f38433b 100644 (file)
@@ -1,7 +1,7 @@
 #include <linux/module.h>
 #include <asm/io.h>
-#include <asm/arch/cache.h>
-#include <asm/arch/hwregs/dma.h>
+#include <arch/cache.h>
+#include <arch/hwregs/dma.h>
 
 /* This file is used to workaround a cache bug, Guinness TR 106. */
 
index 77d02c1..64933e2 100644 (file)
@@ -1,9 +1,9 @@
 #include <linux/module.h>
 #include <linux/irq.h>
-#include <asm/arch/dma.h>
-#include <asm/arch/intmem.h>
-#include <asm/arch/mach/pinmux.h>
-#include <asm/arch/io.h>
+#include <arch/dma.h>
+#include <arch/intmem.h>
+#include <mach/pinmux.h>
+#include <arch/io.h>
 
 /* Functions for allocating DMA channels */
 EXPORT_SYMBOL(crisv32_request_dma);
index 15af4c2..794b364 100644 (file)
@@ -9,7 +9,7 @@
 #include <hwregs/reg_map.h>
 #include <hwregs/ser_defs.h>
 #include <hwregs/dma_defs.h>
-#include <asm/arch/mach/pinmux.h>
+#include <mach/pinmux.h>
 
 struct dbg_port
 {
index eebbaba..7f6f93e 100644 (file)
@@ -24,8 +24,8 @@
 #include <asm/thread_info.h>
 #include <asm/asm-offsets.h>
 
-#include <asm/arch/hwregs/asm/reg_map_asm.h>
-#include <asm/arch/hwregs/asm/intr_vect_defs_asm.h>
+#include <hwregs/asm/reg_map_asm.h>
+#include <hwregs/asm/intr_vect_defs_asm.h>
 
        ;; Exported functions.
        .globl system_call
index 2d66a7c..3db478e 100644 (file)
  * The macros found in mmu_defs_asm.h uses the ## concatenation operator, so
  * -traditional must not be used when assembling this file.
  */
+#include <linux/autoconf.h>
+#include <arch/memmap.h>
 #include <hwregs/reg_rdwr.h>
-#include <asm/arch/memmap.h>
 #include <hwregs/intr_vect.h>
 #include <hwregs/asm/mmu_defs_asm.h>
 #include <hwregs/asm/reg_map_asm.h>
-#include <asm/arch/mach/startup.inc>
+#include <mach/startup.inc>
 
 #define CRAMFS_MAGIC 0x28cd3d45
 #define JHEAD_MAGIC 0x1FF528A6
@@ -217,7 +218,14 @@ _inflash:
        beq     _dram_initialized
        nop
 
-#include "../mach/dram_init.S"
+#if defined CONFIG_ETRAXFS
+#include "../mach-fs/dram_init.S"
+#elif defined CONFIG_CRIS_MACH_ARTPEC3
+#include "../mach-a3/dram_init.S"
+#else
+#error Only ETRAXFS and ARTPEC-3 supported!
+#endif
+
 
 _dram_initialized:
        ;; Copy the text and data section to DRAM. This depends on that the
@@ -472,4 +480,10 @@ swapper_pg_dir = 0xc0002000
 
        .section ".init.data", "aw"
 
-#include "../mach/hw_settings.S"
+#if defined CONFIG_ETRAXFS
+#include "../mach-fs/hw_settings.S"
+#elif defined CONFIG_CRIS_MACH_ARTPEC3
+#include "../mach-a3/hw_settings.S"
+#else
+#error Only ETRAXFS and ARTPEC-3 supported!
+#endif
index 8bd5a5b..c981fd6 100644 (file)
 #include <asm/ptrace.h>
 
 #include <asm/irq.h>
-#include <asm/arch/hwregs/reg_map.h>
-#include <asm/arch/hwregs/reg_rdwr.h>
-#include <asm/arch/hwregs/intr_vect_defs.h>
-#include <asm/arch/hwregs/ser_defs.h>
+#include <arch/hwregs/reg_map.h>
+#include <arch/hwregs/reg_rdwr.h>
+#include <arch/hwregs/intr_vect_defs.h>
+#include <arch/hwregs/ser_defs.h>
 
 /* From entry.S. */
 extern void gdb_handle_exception(void);
index 3e7fa9e..eba93e7 100644 (file)
@@ -5,7 +5,7 @@
  * port exceptions for kernel debugging purposes.
  */
 
-#include <asm/arch/hwregs/intr_vect.h>
+#include <arch/hwregs/intr_vect.h>
 
        ;; Exported functions.
        .globl kgdb_handle_exception
index a2b8aa3..6eb54ea 100644 (file)
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/spinlock.h>
-#include <asm/arch/hwregs/reg_map.h>
-#include <asm/arch/hwregs/reg_rdwr.h>
-#include <asm/arch/pinmux.h>
-#include <asm/arch/hwregs/pinmux_defs.h>
+#include <arch/hwregs/reg_map.h>
+#include <arch/hwregs/reg_rdwr.h>
+#include <arch/pinmux.h>
+#include <arch/hwregs/pinmux_defs.h>
 
 #undef DEBUG
 
index e27f467..dd40147 100644 (file)
@@ -17,7 +17,7 @@
 #include <asm/pgtable.h>
 #include <asm/system.h>
 #include <asm/processor.h>
-#include <asm/arch/hwregs/supp_reg.h>
+#include <arch/hwregs/supp_reg.h>
 
 /*
  * Determines which bits in CCS the user has access to.
index 58c1866..da7d2be 100644 (file)
@@ -18,8 +18,8 @@
 #include <asm/processor.h>
 #include <asm/ucontext.h>
 #include <asm/uaccess.h>
-#include <asm/arch/ptrace.h>
-#include <asm/arch/hwregs/cpu_vect.h>
+#include <arch/ptrace.h>
+#include <arch/hwregs/cpu_vect.h>
 
 extern unsigned long cris_signal_return_page;
 
index e019816..e705f5c 100644 (file)
 ##
 ##=============================================================================
 
-#include <asm/arch/hwregs/asm/reg_map_asm.h>
-#include <asm/arch/hwregs/asm/gio_defs_asm.h>
-#include <asm/arch/hwregs/asm/pinmux_defs_asm.h>
-#include <asm/arch/hwregs/asm/bif_core_defs_asm.h>
-#include <asm/arch/hwregs/asm/config_defs_asm.h>
+#include <arch/hwregs/asm/reg_map_asm.h>
+#include <arch/hwregs/asm/gio_defs_asm.h>
+#include <arch/hwregs/asm/pinmux_defs_asm.h>
+#include <arch/hwregs/asm/bif_core_defs_asm.h>
+#include <arch/hwregs/asm/config_defs_asm.h>
 
 ;; There are 8-bit NAND flashes and 16-bit NAND flashes.
 ;; We need to treat them slightly different.
index 25f236e..f35e4f6 100644 (file)
@@ -2,7 +2,7 @@
 
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
-#include <asm/arch/mach/dma.h>
+#include <mach/dma.h>
 #include <hwregs/reg_map.h>
 #include <hwregs/reg_rdwr.h>
 #include <hwregs/marb_defs.h>
index 9eeaf3e..c22f67e 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <asm/io.h>
-#include <asm/arch/mach/pinmux.h>
+#include <mach/pinmux.h>
 #include <hwregs/gio_defs.h>
 
 struct crisv32_ioport crisv32_ioports[] = {
index 58bd71e..d92cf70 100644 (file)
@@ -2,9 +2,9 @@
 #include <linux/module.h>
 #include <linux/cpufreq.h>
 #include <hwregs/reg_map.h>
-#include <asm/arch/hwregs/reg_rdwr.h>
-#include <asm/arch/hwregs/config_defs.h>
-#include <asm/arch/hwregs/bif_core_defs.h>
+#include <arch/hwregs/reg_rdwr.h>
+#include <arch/hwregs/config_defs.h>
+#include <arch/hwregs/bif_core_defs.h>
 
 static int
 cris_sdram_freq_notifier(struct notifier_block *nb, unsigned long val,
index a6acf4e..2d970d7 100644 (file)
@@ -10,7 +10,7 @@
 #include <hwregs/strmux_defs.h>
 #include <linux/errno.h>
 #include <asm/system.h>
-#include <asm/arch/mach/arbiter.h>
+#include <mach/arbiter.h>
 
 static char used_dma_channels[MAX_DMA_CHANNELS];
 static const char *used_dma_channels_users[MAX_DMA_CHANNELS];
index a03a3ad..cb6327b 100644 (file)
@@ -12,8 +12,8 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <asm/io.h>
-#include <asm/arch/pinmux.h>
-#include <asm/arch/hwregs/gio_defs.h>
+#include <mach/pinmux.h>
+#include <hwregs/gio_defs.h>
 
 #ifndef DEBUG
 #define DEBUG(x)
index 593b10f..b11594a 100644 (file)
@@ -5,8 +5,8 @@
 
 #include "vcs_hook.h"
 #include <stdarg.h>
-#include <asm/arch-v32/hwregs/reg_map.h>
-#include <asm/arch-v32/hwregs/intr_vect_defs.h>
+#include <arch-v32/hwregs/reg_map.h>
+#include <arch-v32/hwregs/intr_vect_defs.h>
 
 #define HOOK_TRIG_ADDR     0xb7000000  /* hook cvlog model reg address */
 #define HOOK_MEM_BASE_ADDR 0xa0000000  /* csp4 (shared mem) base addr */
index 8a34b8b..caeb921 100644 (file)
@@ -16,8 +16,8 @@
 #include <asm/mmu.h>
 #include <asm/io.h>
 #include <asm/mmu_context.h>
-#include <asm/arch/hwregs/asm/mmu_defs_asm.h>
-#include <asm/arch/hwregs/supp_reg.h>
+#include <arch/hwregs/asm/mmu_defs_asm.h>
+#include <arch/hwregs/supp_reg.h>
 
 extern void tlb_init(void);
 
index eda5ebc..55ade36 100644 (file)
@@ -9,8 +9,8 @@
 
 #include <asm/tlb.h>
 #include <asm/mmu_context.h>
-#include <asm/arch/hwregs/asm/mmu_defs_asm.h>
-#include <asm/arch/hwregs/supp_reg.h>
+#include <arch/hwregs/asm/mmu_defs_asm.h>
+#include <arch/hwregs/supp_reg.h>
 
 #define UPDATE_TLB_SEL_IDX(val)                                        \
 do {                                                           \
similarity index 99%
rename from include/asm-cris/arch-v10/io.h
rename to arch/cris/include/arch-v10/arch/io.h
index c08c242..f627ad0 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef _ASM_ARCH_CRIS_IO_H
 #define _ASM_ARCH_CRIS_IO_H
 
-#include <asm/arch/svinto.h>
+#include <arch/svinto.h>
 
 /* Etrax shadow registers - which live in arch/cris/kernel/shadows.c */
 
similarity index 99%
rename from include/asm-cris/arch-v10/irq.h
rename to arch/cris/include/arch-v10/arch/irq.h
index b1128a9..6248004 100644 (file)
@@ -5,7 +5,7 @@
 #ifndef _ASM_ARCH_IRQ_H
 #define _ASM_ARCH_IRQ_H
 
-#include <asm/arch/sv_addr_ag.h>
+#include <arch/sv_addr_ag.h>
 
 #define NR_IRQS 32
 
similarity index 93%
rename from include/asm-cris/arch-v32/cache.h
rename to arch/cris/include/arch-v32/arch/cache.h
index b3d752d..dfc7305 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef _ASM_CRIS_ARCH_CACHE_H
 #define _ASM_CRIS_ARCH_CACHE_H
 
-#include <asm/arch/hwregs/dma.h>
+#include <arch/hwregs/dma.h>
 
 /* A cache-line is 32 bytes. */
 #define L1_CACHE_BYTES 32
similarity index 99%
rename from include/asm-cris/arch-v32/cryptocop.h
rename to arch/cris/include/arch-v32/arch/cryptocop.h
index dfa1f66..e1cd83d 100644 (file)
@@ -122,7 +122,7 @@ struct strcop_crypto_op{
 
 /********** The API to use from inside the kernel. ************/
 
-#include <asm/arch/hwregs/dma.h>
+#include <arch/hwregs/dma.h>
 
 typedef enum {
        cryptocop_alg_csum = 0,
similarity index 98%
rename from include/asm-cris/arch-v32/io.h
rename to arch/cris/include/arch-v32/arch/io.h
index 6b38912..7202445 100644 (file)
@@ -43,7 +43,7 @@ extern struct crisv32_iopin crisv32_led_net1_red;
 
 static inline void crisv32_io_set(struct crisv32_iopin *iopin, int val)
 {
-       long flags;
+       unsigned long flags;
        spin_lock_irqsave(&iopin->port->lock, flags);
 
        if (val)
@@ -57,7 +57,7 @@ static inline void crisv32_io_set(struct crisv32_iopin *iopin, int val)
 static inline void crisv32_io_set_dir(struct crisv32_iopin* iopin,
                               enum crisv32_io_dir dir)
 {
-       long flags;
+       unsigned long flags;
        spin_lock_irqsave(&iopin->port->lock, flags);
 
        if (dir == crisv32_io_dir_in)
similarity index 99%
rename from include/asm-cris/atomic.h
rename to arch/cris/include/asm/atomic.h
index 5fc8776..f71ea68 100644 (file)
@@ -6,7 +6,7 @@
 #include <linux/compiler.h>
 
 #include <asm/system.h>
-#include <asm/arch/atomic.h>
+#include <arch/atomic.h>
 
 /*
  * Atomic operations that C can't guarantee us.  Useful for
similarity index 99%
rename from include/asm-cris/bitops.h
rename to arch/cris/include/asm/bitops.h
index 75ea6e0..c0e62f8 100644 (file)
@@ -18,7 +18,7 @@
 #error only <linux/bitops.h> can be included directly
 #endif
 
-#include <asm/arch/bitops.h>
+#include <arch/bitops.h>
 #include <asm/system.h>
 #include <asm/atomic.h>
 #include <linux/compiler.h>
similarity index 64%
rename from include/asm-cris/bug.h
rename to arch/cris/include/asm/bug.h
index fee12d4..3b39589 100644 (file)
@@ -1,4 +1,4 @@
 #ifndef _CRIS_BUG_H
 #define _CRIS_BUG_H
-#include <asm/arch/bug.h>
+#include <arch/bug.h>
 #endif
similarity index 94%
rename from include/asm-cris/byteorder.h
rename to arch/cris/include/asm/byteorder.h
index 0cd9db1..cc8e418 100644 (file)
@@ -4,7 +4,7 @@
 #ifdef __GNUC__
 
 #ifdef __KERNEL__
-#include <asm/arch/byteorder.h>
+#include <arch/byteorder.h>
 
 /* defines are necessary because the other files detect the presence
  * of a defined __arch_swab32, not an inline
similarity index 71%
rename from include/asm-cris/cache.h
rename to arch/cris/include/asm/cache.h
index 46a3b26..a692b9f 100644 (file)
@@ -1,6 +1,6 @@
 #ifndef _ASM_CACHE_H
 #define _ASM_CACHE_H
 
-#include <asm/arch/cache.h>
+#include <arch/cache.h>
 
 #endif /* _ASM_CACHE_H */
similarity index 98%
rename from include/asm-cris/checksum.h
rename to arch/cris/include/asm/checksum.h
index c6c5be6..75dcb77 100644 (file)
@@ -3,7 +3,7 @@
 #ifndef _CRIS_CHECKSUM_H
 #define _CRIS_CHECKSUM_H
 
-#include <asm/arch/checksum.h>
+#include <arch/checksum.h>
 
 /*
  * computes the checksum of a memory block at buff, length len,
similarity index 94%
rename from include/asm-cris/delay.h
rename to arch/cris/include/asm/delay.h
index 123e19a..75ec581 100644 (file)
@@ -7,7 +7,7 @@
  * Delay routines, using a pre-computed "loops_per_second" value.
  */
 
-#include <asm/arch/delay.h>
+#include <arch/delay.h>
 
 /* Use only for very small delays ( < 1 msec).  */
 
similarity index 93%
rename from include/asm-cris/dma.h
rename to arch/cris/include/asm/dma.h
index 6f188dc..30fd715 100644 (file)
@@ -3,7 +3,7 @@
 #ifndef _ASM_DMA_H
 #define _ASM_DMA_H
 
-#include <asm/arch/dma.h>
+#include <arch/dma.h>
 
 /* it's useless on the Etrax, but unfortunately needed by the new
    bootmem allocator (but this should do it for this) */
similarity index 99%
rename from include/asm-cris/elf.h
rename to arch/cris/include/asm/elf.h
index f0d17fb..0f51b10 100644 (file)
@@ -45,7 +45,7 @@ typedef unsigned long elf_fpregset_t;
 #define ELF_DATA       ELFDATA2LSB
 #define ELF_ARCH       EM_CRIS
 
-#include <asm/arch/elf.h>
+#include <arch/elf.h>
 
 /* The master for these definitions is {binutils}/include/elf/cris.h:  */
 /* User symbols in this file have a leading underscore.  */
similarity index 99%
rename from include/asm-cris/io.h
rename to arch/cris/include/asm/io.h
index b87ce63..32567bc 100644 (file)
@@ -2,7 +2,7 @@
 #define _ASM_CRIS_IO_H
 
 #include <asm/page.h>   /* for __va, __pa */
-#include <asm/arch/io.h>
+#include <arch/io.h>
 #include <linux/kernel.h>
 
 struct cris_io_operations
similarity index 83%
rename from include/asm-cris/irq.h
rename to arch/cris/include/asm/irq.h
index 998cce9..ce0fcf5 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef _ASM_IRQ_H
 #define _ASM_IRQ_H
 
-#include <asm/arch/irq.h>
+#include <arch/irq.h>
 
 static inline int irq_canonicalize(int irq)
 {  
similarity index 78%
rename from include/asm-cris/mmu.h
rename to arch/cris/include/asm/mmu.h
index c40a1bc..e06ea94 100644 (file)
@@ -5,6 +5,6 @@
 #ifndef _CRIS_MMU_H
 #define _CRIS_MMU_H
 
-#include <asm/arch/mmu.h>
+#include <arch/mmu.h>
 
 #endif
similarity index 98%
rename from include/asm-cris/page.h
rename to arch/cris/include/asm/page.h
index d19272b..f3fdbd0 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef _CRIS_PAGE_H
 #define _CRIS_PAGE_H
 
-#include <asm/arch/page.h>
+#include <arch/page.h>
 #include <linux/const.h>
 
 /* PAGE_SHIFT determines the page size */
similarity index 99%
rename from include/asm-cris/pgtable.h
rename to arch/cris/include/asm/pgtable.h
index 829e7a7..50aa974 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/sched.h>
 #include <asm/mmu.h>
 #endif
-#include <asm/arch/pgtable.h>
+#include <arch/pgtable.h>
 
 /*
  * The Linux memory management assumes a three-level page table setup. On
similarity index 98%
rename from include/asm-cris/processor.h
rename to arch/cris/include/asm/processor.h
index cdc0c1d..3f7248f 100644 (file)
@@ -13,7 +13,7 @@
 #include <asm/system.h>
 #include <asm/page.h>
 #include <asm/ptrace.h>
-#include <asm/arch/processor.h>
+#include <arch/processor.h>
 
 struct task_struct;
 
similarity index 91%
rename from include/asm-cris/ptrace.h
rename to arch/cris/include/asm/ptrace.h
index d910925..6618893 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef _CRIS_PTRACE_H
 #define _CRIS_PTRACE_H
 
-#include <asm/arch/ptrace.h>
+#include <arch/ptrace.h>
 
 #ifdef __KERNEL__
 
diff --git a/arch/cris/include/asm/spinlock.h b/arch/cris/include/asm/spinlock.h
new file mode 100644 (file)
index 0000000..ed816b5
--- /dev/null
@@ -0,0 +1 @@
+#include <arch/spinlock.h>
similarity index 98%
rename from include/asm-cris/system.h
rename to arch/cris/include/asm/system.h
index 5bcfe5a..8657b08 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ASM_CRIS_SYSTEM_H
 #define __ASM_CRIS_SYSTEM_H
 
-#include <asm/arch/system.h>
+#include <arch/system.h>
 
 /* the switch_to macro calls resume, an asm function in entry.S which does the actual
  * task switching.
similarity index 98%
rename from include/asm-cris/thread_info.h
rename to arch/cris/include/asm/thread_info.h
index cee97f1..bc5b293 100644 (file)
@@ -16,7 +16,7 @@
 #ifndef __ASSEMBLY__
 #include <asm/types.h>
 #include <asm/processor.h>
-#include <asm/arch/thread_info.h>
+#include <arch/thread_info.h>
 #include <asm/segment.h>
 #endif
 
similarity index 92%
rename from include/asm-cris/timex.h
rename to arch/cris/include/asm/timex.h
index b92e0e8..980924a 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef _ASM_CRIS_TIMEX_H
 #define _ASM_CRIS_TIMEX_H
 
-#include <asm/arch/timex.h>
+#include <arch/timex.h>
 
 /*
  * We don't have a cycle-counter.. but we do not support SMP anyway where this is
similarity index 93%
rename from include/asm-cris/tlb.h
rename to arch/cris/include/asm/tlb.h
index 7724246..77384ea 100644 (file)
@@ -3,7 +3,7 @@
 
 #include <linux/pagemap.h>
 
-#include <asm/arch/tlb.h>
+#include <arch/tlb.h>
 
 /*
  * cris doesn't need any special per-pte or
similarity index 99%
rename from include/asm-cris/uaccess.h
rename to arch/cris/include/asm/uaccess.h
index ea11eaf..9145408 100644 (file)
@@ -54,7 +54,7 @@
 #define __access_ok(addr,size) (__kernel_ok || __user_ok((addr),(size)))
 #define access_ok(type,addr,size) __access_ok((unsigned long)(addr),(size))
 
-#include <asm/arch/uaccess.h>
+#include <arch/uaccess.h>
 
 /*
  * The exception table consists of pairs of addresses: the first is the
similarity index 99%
rename from include/asm-cris/unistd.h
rename to arch/cris/include/asm/unistd.h
index 76398ef..235d076 100644 (file)
 
 #define NR_syscalls 327
 
-#include <asm/arch/unistd.h>
+#include <arch/unistd.h>
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
similarity index 98%
rename from include/asm-cris/user.h
rename to arch/cris/include/asm/user.h
index 73e60fc..59147cf 100644 (file)
@@ -4,7 +4,7 @@
 #include <linux/types.h>
 #include <asm/ptrace.h>
 #include <asm/page.h>
-#include <asm/arch/user.h>
+#include <arch/user.h>
 
 /*
  * Core file format: The core file is written in such a way that gdb