commit | c6557e7f2b6ae76a44653d38f835174074c42e05 | [log] [tgz] |
---|---|---|
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | Fri Aug 01 20:42:05 2008 +0200 |
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | Fri Aug 01 20:42:05 2008 +0200 |
tree | da619a76b309cb1cd259d082af768a83cfcd6d52 | |
parent | ab4227cb2d936886069ef1056c02500d05beb15d [diff] |
[S390] move include/asm-s390 to arch/s390/include/asm Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
diff --git a/include/asm-s390/Kbuild b/arch/s390/include/asm/Kbuild similarity index 100% rename from include/asm-s390/Kbuild rename to arch/s390/include/asm/Kbuild
diff --git a/include/asm-s390/airq.h b/arch/s390/include/asm/airq.h similarity index 100% rename from include/asm-s390/airq.h rename to arch/s390/include/asm/airq.h
diff --git a/include/asm-s390/appldata.h b/arch/s390/include/asm/appldata.h similarity index 100% rename from include/asm-s390/appldata.h rename to arch/s390/include/asm/appldata.h
diff --git a/include/asm-s390/atomic.h b/arch/s390/include/asm/atomic.h similarity index 100% rename from include/asm-s390/atomic.h rename to arch/s390/include/asm/atomic.h
diff --git a/include/asm-s390/auxvec.h b/arch/s390/include/asm/auxvec.h similarity index 100% rename from include/asm-s390/auxvec.h rename to arch/s390/include/asm/auxvec.h
diff --git a/include/asm-s390/bitops.h b/arch/s390/include/asm/bitops.h similarity index 100% rename from include/asm-s390/bitops.h rename to arch/s390/include/asm/bitops.h
diff --git a/include/asm-s390/bug.h b/arch/s390/include/asm/bug.h similarity index 100% rename from include/asm-s390/bug.h rename to arch/s390/include/asm/bug.h
diff --git a/include/asm-s390/bugs.h b/arch/s390/include/asm/bugs.h similarity index 100% rename from include/asm-s390/bugs.h rename to arch/s390/include/asm/bugs.h
diff --git a/include/asm-s390/byteorder.h b/arch/s390/include/asm/byteorder.h similarity index 100% rename from include/asm-s390/byteorder.h rename to arch/s390/include/asm/byteorder.h
diff --git a/include/asm-s390/cache.h b/arch/s390/include/asm/cache.h similarity index 100% rename from include/asm-s390/cache.h rename to arch/s390/include/asm/cache.h
diff --git a/include/asm-s390/cacheflush.h b/arch/s390/include/asm/cacheflush.h similarity index 100% rename from include/asm-s390/cacheflush.h rename to arch/s390/include/asm/cacheflush.h
diff --git a/include/asm-s390/ccwdev.h b/arch/s390/include/asm/ccwdev.h similarity index 100% rename from include/asm-s390/ccwdev.h rename to arch/s390/include/asm/ccwdev.h
diff --git a/include/asm-s390/ccwgroup.h b/arch/s390/include/asm/ccwgroup.h similarity index 100% rename from include/asm-s390/ccwgroup.h rename to arch/s390/include/asm/ccwgroup.h
diff --git a/include/asm-s390/checksum.h b/arch/s390/include/asm/checksum.h similarity index 100% rename from include/asm-s390/checksum.h rename to arch/s390/include/asm/checksum.h
diff --git a/include/asm-s390/chpid.h b/arch/s390/include/asm/chpid.h similarity index 100% rename from include/asm-s390/chpid.h rename to arch/s390/include/asm/chpid.h
diff --git a/include/asm-s390/chsc.h b/arch/s390/include/asm/chsc.h similarity index 100% rename from include/asm-s390/chsc.h rename to arch/s390/include/asm/chsc.h
diff --git a/include/asm-s390/cio.h b/arch/s390/include/asm/cio.h similarity index 100% rename from include/asm-s390/cio.h rename to arch/s390/include/asm/cio.h
diff --git a/include/asm-s390/cmb.h b/arch/s390/include/asm/cmb.h similarity index 100% rename from include/asm-s390/cmb.h rename to arch/s390/include/asm/cmb.h
diff --git a/include/asm-s390/compat.h b/arch/s390/include/asm/compat.h similarity index 100% rename from include/asm-s390/compat.h rename to arch/s390/include/asm/compat.h
diff --git a/include/asm-s390/cpcmd.h b/arch/s390/include/asm/cpcmd.h similarity index 100% rename from include/asm-s390/cpcmd.h rename to arch/s390/include/asm/cpcmd.h
diff --git a/include/asm-s390/cpu.h b/arch/s390/include/asm/cpu.h similarity index 100% rename from include/asm-s390/cpu.h rename to arch/s390/include/asm/cpu.h
diff --git a/include/asm-s390/cputime.h b/arch/s390/include/asm/cputime.h similarity index 100% rename from include/asm-s390/cputime.h rename to arch/s390/include/asm/cputime.h
diff --git a/include/asm-s390/current.h b/arch/s390/include/asm/current.h similarity index 100% rename from include/asm-s390/current.h rename to arch/s390/include/asm/current.h
diff --git a/include/asm-s390/dasd.h b/arch/s390/include/asm/dasd.h similarity index 100% rename from include/asm-s390/dasd.h rename to arch/s390/include/asm/dasd.h
diff --git a/include/asm-s390/debug.h b/arch/s390/include/asm/debug.h similarity index 100% rename from include/asm-s390/debug.h rename to arch/s390/include/asm/debug.h
diff --git a/include/asm-s390/delay.h b/arch/s390/include/asm/delay.h similarity index 100% rename from include/asm-s390/delay.h rename to arch/s390/include/asm/delay.h
diff --git a/include/asm-s390/device.h b/arch/s390/include/asm/device.h similarity index 100% rename from include/asm-s390/device.h rename to arch/s390/include/asm/device.h
diff --git a/include/asm-s390/diag.h b/arch/s390/include/asm/diag.h similarity index 100% rename from include/asm-s390/diag.h rename to arch/s390/include/asm/diag.h
diff --git a/include/asm-s390/div64.h b/arch/s390/include/asm/div64.h similarity index 100% rename from include/asm-s390/div64.h rename to arch/s390/include/asm/div64.h
diff --git a/include/asm-s390/dma.h b/arch/s390/include/asm/dma.h similarity index 100% rename from include/asm-s390/dma.h rename to arch/s390/include/asm/dma.h
diff --git a/include/asm-s390/ebcdic.h b/arch/s390/include/asm/ebcdic.h similarity index 100% rename from include/asm-s390/ebcdic.h rename to arch/s390/include/asm/ebcdic.h
diff --git a/include/asm-s390/elf.h b/arch/s390/include/asm/elf.h similarity index 100% rename from include/asm-s390/elf.h rename to arch/s390/include/asm/elf.h
diff --git a/include/asm-s390/emergency-restart.h b/arch/s390/include/asm/emergency-restart.h similarity index 100% rename from include/asm-s390/emergency-restart.h rename to arch/s390/include/asm/emergency-restart.h
diff --git a/include/asm-s390/errno.h b/arch/s390/include/asm/errno.h similarity index 100% rename from include/asm-s390/errno.h rename to arch/s390/include/asm/errno.h
diff --git a/include/asm-s390/etr.h b/arch/s390/include/asm/etr.h similarity index 100% rename from include/asm-s390/etr.h rename to arch/s390/include/asm/etr.h
diff --git a/include/asm-s390/extmem.h b/arch/s390/include/asm/extmem.h similarity index 100% rename from include/asm-s390/extmem.h rename to arch/s390/include/asm/extmem.h
diff --git a/include/asm-s390/fb.h b/arch/s390/include/asm/fb.h similarity index 100% rename from include/asm-s390/fb.h rename to arch/s390/include/asm/fb.h
diff --git a/include/asm-s390/fcntl.h b/arch/s390/include/asm/fcntl.h similarity index 100% rename from include/asm-s390/fcntl.h rename to arch/s390/include/asm/fcntl.h
diff --git a/include/asm-s390/fcx.h b/arch/s390/include/asm/fcx.h similarity index 100% rename from include/asm-s390/fcx.h rename to arch/s390/include/asm/fcx.h
diff --git a/include/asm-s390/futex.h b/arch/s390/include/asm/futex.h similarity index 100% rename from include/asm-s390/futex.h rename to arch/s390/include/asm/futex.h
diff --git a/include/asm-s390/hardirq.h b/arch/s390/include/asm/hardirq.h similarity index 100% rename from include/asm-s390/hardirq.h rename to arch/s390/include/asm/hardirq.h
diff --git a/include/asm-s390/hugetlb.h b/arch/s390/include/asm/hugetlb.h similarity index 100% rename from include/asm-s390/hugetlb.h rename to arch/s390/include/asm/hugetlb.h
diff --git a/include/asm-s390/idals.h b/arch/s390/include/asm/idals.h similarity index 100% rename from include/asm-s390/idals.h rename to arch/s390/include/asm/idals.h
diff --git a/include/asm-s390/io.h b/arch/s390/include/asm/io.h similarity index 100% rename from include/asm-s390/io.h rename to arch/s390/include/asm/io.h
diff --git a/include/asm-s390/ioctl.h b/arch/s390/include/asm/ioctl.h similarity index 100% rename from include/asm-s390/ioctl.h rename to arch/s390/include/asm/ioctl.h
diff --git a/include/asm-s390/ioctls.h b/arch/s390/include/asm/ioctls.h similarity index 100% rename from include/asm-s390/ioctls.h rename to arch/s390/include/asm/ioctls.h
diff --git a/include/asm-s390/ipcbuf.h b/arch/s390/include/asm/ipcbuf.h similarity index 100% rename from include/asm-s390/ipcbuf.h rename to arch/s390/include/asm/ipcbuf.h
diff --git a/include/asm-s390/ipl.h b/arch/s390/include/asm/ipl.h similarity index 100% rename from include/asm-s390/ipl.h rename to arch/s390/include/asm/ipl.h
diff --git a/include/asm-s390/irq.h b/arch/s390/include/asm/irq.h similarity index 100% rename from include/asm-s390/irq.h rename to arch/s390/include/asm/irq.h
diff --git a/include/asm-s390/irq_regs.h b/arch/s390/include/asm/irq_regs.h similarity index 100% rename from include/asm-s390/irq_regs.h rename to arch/s390/include/asm/irq_regs.h
diff --git a/include/asm-s390/irqflags.h b/arch/s390/include/asm/irqflags.h similarity index 100% rename from include/asm-s390/irqflags.h rename to arch/s390/include/asm/irqflags.h
diff --git a/include/asm-s390/isc.h b/arch/s390/include/asm/isc.h similarity index 100% rename from include/asm-s390/isc.h rename to arch/s390/include/asm/isc.h
diff --git a/include/asm-s390/itcw.h b/arch/s390/include/asm/itcw.h similarity index 100% rename from include/asm-s390/itcw.h rename to arch/s390/include/asm/itcw.h
diff --git a/include/asm-s390/kdebug.h b/arch/s390/include/asm/kdebug.h similarity index 100% rename from include/asm-s390/kdebug.h rename to arch/s390/include/asm/kdebug.h
diff --git a/include/asm-s390/kexec.h b/arch/s390/include/asm/kexec.h similarity index 100% rename from include/asm-s390/kexec.h rename to arch/s390/include/asm/kexec.h
diff --git a/include/asm-s390/kmap_types.h b/arch/s390/include/asm/kmap_types.h similarity index 100% rename from include/asm-s390/kmap_types.h rename to arch/s390/include/asm/kmap_types.h
diff --git a/include/asm-s390/kprobes.h b/arch/s390/include/asm/kprobes.h similarity index 100% rename from include/asm-s390/kprobes.h rename to arch/s390/include/asm/kprobes.h
diff --git a/include/asm-s390/kvm.h b/arch/s390/include/asm/kvm.h similarity index 100% rename from include/asm-s390/kvm.h rename to arch/s390/include/asm/kvm.h
diff --git a/include/asm-s390/kvm_host.h b/arch/s390/include/asm/kvm_host.h similarity index 100% rename from include/asm-s390/kvm_host.h rename to arch/s390/include/asm/kvm_host.h
diff --git a/include/asm-s390/kvm_para.h b/arch/s390/include/asm/kvm_para.h similarity index 100% rename from include/asm-s390/kvm_para.h rename to arch/s390/include/asm/kvm_para.h
diff --git a/include/asm-s390/kvm_virtio.h b/arch/s390/include/asm/kvm_virtio.h similarity index 100% rename from include/asm-s390/kvm_virtio.h rename to arch/s390/include/asm/kvm_virtio.h
diff --git a/include/asm-s390/linkage.h b/arch/s390/include/asm/linkage.h similarity index 100% rename from include/asm-s390/linkage.h rename to arch/s390/include/asm/linkage.h
diff --git a/include/asm-s390/local.h b/arch/s390/include/asm/local.h similarity index 100% rename from include/asm-s390/local.h rename to arch/s390/include/asm/local.h
diff --git a/include/asm-s390/lowcore.h b/arch/s390/include/asm/lowcore.h similarity index 100% rename from include/asm-s390/lowcore.h rename to arch/s390/include/asm/lowcore.h
diff --git a/include/asm-s390/mathemu.h b/arch/s390/include/asm/mathemu.h similarity index 100% rename from include/asm-s390/mathemu.h rename to arch/s390/include/asm/mathemu.h
diff --git a/include/asm-s390/mman.h b/arch/s390/include/asm/mman.h similarity index 100% rename from include/asm-s390/mman.h rename to arch/s390/include/asm/mman.h
diff --git a/include/asm-s390/mmu.h b/arch/s390/include/asm/mmu.h similarity index 100% rename from include/asm-s390/mmu.h rename to arch/s390/include/asm/mmu.h
diff --git a/include/asm-s390/mmu_context.h b/arch/s390/include/asm/mmu_context.h similarity index 100% rename from include/asm-s390/mmu_context.h rename to arch/s390/include/asm/mmu_context.h
diff --git a/include/asm-s390/module.h b/arch/s390/include/asm/module.h similarity index 100% rename from include/asm-s390/module.h rename to arch/s390/include/asm/module.h
diff --git a/include/asm-s390/monwriter.h b/arch/s390/include/asm/monwriter.h similarity index 100% rename from include/asm-s390/monwriter.h rename to arch/s390/include/asm/monwriter.h
diff --git a/include/asm-s390/msgbuf.h b/arch/s390/include/asm/msgbuf.h similarity index 100% rename from include/asm-s390/msgbuf.h rename to arch/s390/include/asm/msgbuf.h
diff --git a/include/asm-s390/mutex.h b/arch/s390/include/asm/mutex.h similarity index 100% rename from include/asm-s390/mutex.h rename to arch/s390/include/asm/mutex.h
diff --git a/include/asm-s390/page.h b/arch/s390/include/asm/page.h similarity index 100% rename from include/asm-s390/page.h rename to arch/s390/include/asm/page.h
diff --git a/include/asm-s390/param.h b/arch/s390/include/asm/param.h similarity index 100% rename from include/asm-s390/param.h rename to arch/s390/include/asm/param.h
diff --git a/include/asm-s390/pci.h b/arch/s390/include/asm/pci.h similarity index 100% rename from include/asm-s390/pci.h rename to arch/s390/include/asm/pci.h
diff --git a/include/asm-s390/percpu.h b/arch/s390/include/asm/percpu.h similarity index 100% rename from include/asm-s390/percpu.h rename to arch/s390/include/asm/percpu.h
diff --git a/include/asm-s390/pgalloc.h b/arch/s390/include/asm/pgalloc.h similarity index 100% rename from include/asm-s390/pgalloc.h rename to arch/s390/include/asm/pgalloc.h
diff --git a/include/asm-s390/pgtable.h b/arch/s390/include/asm/pgtable.h similarity index 100% rename from include/asm-s390/pgtable.h rename to arch/s390/include/asm/pgtable.h
diff --git a/include/asm-s390/poll.h b/arch/s390/include/asm/poll.h similarity index 100% rename from include/asm-s390/poll.h rename to arch/s390/include/asm/poll.h
diff --git a/include/asm-s390/posix_types.h b/arch/s390/include/asm/posix_types.h similarity index 100% rename from include/asm-s390/posix_types.h rename to arch/s390/include/asm/posix_types.h
diff --git a/include/asm-s390/processor.h b/arch/s390/include/asm/processor.h similarity index 100% rename from include/asm-s390/processor.h rename to arch/s390/include/asm/processor.h
diff --git a/include/asm-s390/ptrace.h b/arch/s390/include/asm/ptrace.h similarity index 100% rename from include/asm-s390/ptrace.h rename to arch/s390/include/asm/ptrace.h
diff --git a/include/asm-s390/qdio.h b/arch/s390/include/asm/qdio.h similarity index 100% rename from include/asm-s390/qdio.h rename to arch/s390/include/asm/qdio.h
diff --git a/include/asm-s390/qeth.h b/arch/s390/include/asm/qeth.h similarity index 100% rename from include/asm-s390/qeth.h rename to arch/s390/include/asm/qeth.h
diff --git a/include/asm-s390/reset.h b/arch/s390/include/asm/reset.h similarity index 100% rename from include/asm-s390/reset.h rename to arch/s390/include/asm/reset.h
diff --git a/include/asm-s390/resource.h b/arch/s390/include/asm/resource.h similarity index 100% rename from include/asm-s390/resource.h rename to arch/s390/include/asm/resource.h
diff --git a/include/asm-s390/rwsem.h b/arch/s390/include/asm/rwsem.h similarity index 100% rename from include/asm-s390/rwsem.h rename to arch/s390/include/asm/rwsem.h
diff --git a/include/asm-s390/s390_ext.h b/arch/s390/include/asm/s390_ext.h similarity index 100% rename from include/asm-s390/s390_ext.h rename to arch/s390/include/asm/s390_ext.h
diff --git a/include/asm-s390/s390_rdev.h b/arch/s390/include/asm/s390_rdev.h similarity index 100% rename from include/asm-s390/s390_rdev.h rename to arch/s390/include/asm/s390_rdev.h
diff --git a/include/asm-s390/scatterlist.h b/arch/s390/include/asm/scatterlist.h similarity index 100% rename from include/asm-s390/scatterlist.h rename to arch/s390/include/asm/scatterlist.h
diff --git a/include/asm-s390/schid.h b/arch/s390/include/asm/schid.h similarity index 100% rename from include/asm-s390/schid.h rename to arch/s390/include/asm/schid.h
diff --git a/include/asm-s390/sclp.h b/arch/s390/include/asm/sclp.h similarity index 100% rename from include/asm-s390/sclp.h rename to arch/s390/include/asm/sclp.h
diff --git a/include/asm-s390/sections.h b/arch/s390/include/asm/sections.h similarity index 100% rename from include/asm-s390/sections.h rename to arch/s390/include/asm/sections.h
diff --git a/include/asm-s390/segment.h b/arch/s390/include/asm/segment.h similarity index 100% rename from include/asm-s390/segment.h rename to arch/s390/include/asm/segment.h
diff --git a/include/asm-s390/sembuf.h b/arch/s390/include/asm/sembuf.h similarity index 100% rename from include/asm-s390/sembuf.h rename to arch/s390/include/asm/sembuf.h
diff --git a/include/asm-s390/setup.h b/arch/s390/include/asm/setup.h similarity index 100% rename from include/asm-s390/setup.h rename to arch/s390/include/asm/setup.h
diff --git a/include/asm-s390/sfp-machine.h b/arch/s390/include/asm/sfp-machine.h similarity index 100% rename from include/asm-s390/sfp-machine.h rename to arch/s390/include/asm/sfp-machine.h
diff --git a/include/asm-s390/sfp-util.h b/arch/s390/include/asm/sfp-util.h similarity index 100% rename from include/asm-s390/sfp-util.h rename to arch/s390/include/asm/sfp-util.h
diff --git a/include/asm-s390/shmbuf.h b/arch/s390/include/asm/shmbuf.h similarity index 100% rename from include/asm-s390/shmbuf.h rename to arch/s390/include/asm/shmbuf.h
diff --git a/include/asm-s390/shmparam.h b/arch/s390/include/asm/shmparam.h similarity index 100% rename from include/asm-s390/shmparam.h rename to arch/s390/include/asm/shmparam.h
diff --git a/include/asm-s390/sigcontext.h b/arch/s390/include/asm/sigcontext.h similarity index 100% rename from include/asm-s390/sigcontext.h rename to arch/s390/include/asm/sigcontext.h
diff --git a/include/asm-s390/siginfo.h b/arch/s390/include/asm/siginfo.h similarity index 100% rename from include/asm-s390/siginfo.h rename to arch/s390/include/asm/siginfo.h
diff --git a/include/asm-s390/signal.h b/arch/s390/include/asm/signal.h similarity index 100% rename from include/asm-s390/signal.h rename to arch/s390/include/asm/signal.h
diff --git a/include/asm-s390/sigp.h b/arch/s390/include/asm/sigp.h similarity index 100% rename from include/asm-s390/sigp.h rename to arch/s390/include/asm/sigp.h
diff --git a/include/asm-s390/smp.h b/arch/s390/include/asm/smp.h similarity index 100% rename from include/asm-s390/smp.h rename to arch/s390/include/asm/smp.h
diff --git a/include/asm-s390/socket.h b/arch/s390/include/asm/socket.h similarity index 100% rename from include/asm-s390/socket.h rename to arch/s390/include/asm/socket.h
diff --git a/include/asm-s390/sockios.h b/arch/s390/include/asm/sockios.h similarity index 100% rename from include/asm-s390/sockios.h rename to arch/s390/include/asm/sockios.h
diff --git a/include/asm-s390/sparsemem.h b/arch/s390/include/asm/sparsemem.h similarity index 100% rename from include/asm-s390/sparsemem.h rename to arch/s390/include/asm/sparsemem.h
diff --git a/include/asm-s390/spinlock.h b/arch/s390/include/asm/spinlock.h similarity index 100% rename from include/asm-s390/spinlock.h rename to arch/s390/include/asm/spinlock.h
diff --git a/include/asm-s390/spinlock_types.h b/arch/s390/include/asm/spinlock_types.h similarity index 100% rename from include/asm-s390/spinlock_types.h rename to arch/s390/include/asm/spinlock_types.h
diff --git a/include/asm-s390/stat.h b/arch/s390/include/asm/stat.h similarity index 100% rename from include/asm-s390/stat.h rename to arch/s390/include/asm/stat.h
diff --git a/include/asm-s390/statfs.h b/arch/s390/include/asm/statfs.h similarity index 100% rename from include/asm-s390/statfs.h rename to arch/s390/include/asm/statfs.h
diff --git a/include/asm-s390/string.h b/arch/s390/include/asm/string.h similarity index 100% rename from include/asm-s390/string.h rename to arch/s390/include/asm/string.h
diff --git a/include/asm-s390/suspend.h b/arch/s390/include/asm/suspend.h similarity index 100% rename from include/asm-s390/suspend.h rename to arch/s390/include/asm/suspend.h
diff --git a/include/asm-s390/sysinfo.h b/arch/s390/include/asm/sysinfo.h similarity index 100% rename from include/asm-s390/sysinfo.h rename to arch/s390/include/asm/sysinfo.h
diff --git a/include/asm-s390/system.h b/arch/s390/include/asm/system.h similarity index 100% rename from include/asm-s390/system.h rename to arch/s390/include/asm/system.h
diff --git a/include/asm-s390/tape390.h b/arch/s390/include/asm/tape390.h similarity index 100% rename from include/asm-s390/tape390.h rename to arch/s390/include/asm/tape390.h
diff --git a/include/asm-s390/termbits.h b/arch/s390/include/asm/termbits.h similarity index 100% rename from include/asm-s390/termbits.h rename to arch/s390/include/asm/termbits.h
diff --git a/include/asm-s390/termios.h b/arch/s390/include/asm/termios.h similarity index 100% rename from include/asm-s390/termios.h rename to arch/s390/include/asm/termios.h
diff --git a/include/asm-s390/thread_info.h b/arch/s390/include/asm/thread_info.h similarity index 100% rename from include/asm-s390/thread_info.h rename to arch/s390/include/asm/thread_info.h
diff --git a/include/asm-s390/timer.h b/arch/s390/include/asm/timer.h similarity index 100% rename from include/asm-s390/timer.h rename to arch/s390/include/asm/timer.h
diff --git a/include/asm-s390/timex.h b/arch/s390/include/asm/timex.h similarity index 100% rename from include/asm-s390/timex.h rename to arch/s390/include/asm/timex.h
diff --git a/include/asm-s390/tlb.h b/arch/s390/include/asm/tlb.h similarity index 100% rename from include/asm-s390/tlb.h rename to arch/s390/include/asm/tlb.h
diff --git a/include/asm-s390/tlbflush.h b/arch/s390/include/asm/tlbflush.h similarity index 100% rename from include/asm-s390/tlbflush.h rename to arch/s390/include/asm/tlbflush.h
diff --git a/include/asm-s390/todclk.h b/arch/s390/include/asm/todclk.h similarity index 100% rename from include/asm-s390/todclk.h rename to arch/s390/include/asm/todclk.h
diff --git a/include/asm-s390/topology.h b/arch/s390/include/asm/topology.h similarity index 100% rename from include/asm-s390/topology.h rename to arch/s390/include/asm/topology.h
diff --git a/include/asm-s390/types.h b/arch/s390/include/asm/types.h similarity index 100% rename from include/asm-s390/types.h rename to arch/s390/include/asm/types.h
diff --git a/include/asm-s390/uaccess.h b/arch/s390/include/asm/uaccess.h similarity index 100% rename from include/asm-s390/uaccess.h rename to arch/s390/include/asm/uaccess.h
diff --git a/include/asm-s390/ucontext.h b/arch/s390/include/asm/ucontext.h similarity index 100% rename from include/asm-s390/ucontext.h rename to arch/s390/include/asm/ucontext.h
diff --git a/include/asm-s390/unaligned.h b/arch/s390/include/asm/unaligned.h similarity index 100% rename from include/asm-s390/unaligned.h rename to arch/s390/include/asm/unaligned.h
diff --git a/include/asm-s390/unistd.h b/arch/s390/include/asm/unistd.h similarity index 100% rename from include/asm-s390/unistd.h rename to arch/s390/include/asm/unistd.h
diff --git a/include/asm-s390/user.h b/arch/s390/include/asm/user.h similarity index 100% rename from include/asm-s390/user.h rename to arch/s390/include/asm/user.h
diff --git a/include/asm-s390/vtoc.h b/arch/s390/include/asm/vtoc.h similarity index 100% rename from include/asm-s390/vtoc.h rename to arch/s390/include/asm/vtoc.h
diff --git a/include/asm-s390/xor.h b/arch/s390/include/asm/xor.h similarity index 100% rename from include/asm-s390/xor.h rename to arch/s390/include/asm/xor.h
diff --git a/include/asm-s390/zcrypt.h b/arch/s390/include/asm/zcrypt.h similarity index 100% rename from include/asm-s390/zcrypt.h rename to arch/s390/include/asm/zcrypt.h