diff --git a/arch/um/Makefile b/arch/um/Makefile
index 88c5b0a52777..94fb24ea5afa 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -21,14 +21,14 @@ core-y			+= $(ARCH_DIR)/kernel/		\
 # Have to precede the include because the included Makefiles reference them.
 SYMLINK_HEADERS := archparam.h system.h sigcontext.h processor.h ptrace.h \
 	module.h vm-flags.h elf.h host_ldt.h
-SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),include/asm-um/$(header))
+SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),$(ARCH_DIR)/include/asm/$(header))
 
 # XXX: The "os" symlink is only used by arch/um/include/os.h, which includes
 # ../os/include/file.h
 #
 # These are cleaned up during mrproper. Please DO NOT fix it again, this is
 # the Correct Thing(tm) to do!
-ARCH_SYMLINKS = include/asm-um/arch $(ARCH_DIR)/include/shared/sysdep $(ARCH_DIR)/os \
+ARCH_SYMLINKS = $(ARCH_DIR)/include/asm/arch $(ARCH_DIR)/include/shared/sysdep $(ARCH_DIR)/os \
 	$(SYMLINK_HEADERS) $(ARCH_DIR)/include/shared/uml-config.h
 
 MODE_INCLUDE	+= -I$(srctree)/$(ARCH_DIR)/include/shared/skas
@@ -38,6 +38,7 @@ include $(srctree)/$(ARCH_DIR)/Makefile-skas
 ARCH_INCLUDE	:= -I$(ARCH_DIR)/include/shared
 ifneq ($(KBUILD_SRC),)
 ARCH_INCLUDE	+= -I$(srctree)/$(ARCH_DIR)/include/shared
+KBUILD_CPPFLAGS += -I$(ARCH_DIR)/include # for arch symlink
 endif
 SYS_DIR		:= $(ARCH_DIR)/include/shared/sysdep-$(SUBARCH)
 
@@ -145,19 +146,19 @@ archclean:
 $(SYMLINK_HEADERS):
 	@echo '  SYMLINK $@'
 ifneq ($(KBUILD_SRC),)
-	$(Q)mkdir -p $(objtree)/include/asm-um
-	$(Q)ln -fsn $(srctree)/include/asm-um/$(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@
+	$(Q)mkdir -p $(objtree)/$(ARCH_DIR)/include/asm
+	$(Q)ln -fsn $(srctree)/$(ARCH_DIR)/include/asm/$(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@
 else
 	$(Q)ln -sf $(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@
 endif
 
-include/asm-um/arch:
+$(ARCH_DIR)/include/asm/arch:
 	@echo '  SYMLINK $@'
 ifneq ($(KBUILD_SRC),)
-	$(Q)mkdir -p $(objtree)/include/asm-um
+	$(Q)mkdir -p $(objtree)/$(ARCH_DIR)/include/asm
 	$(Q)ln -fsn $(srctree)/include/asm-$(HEADER_ARCH) $@
 else
-	$(Q)ln -fsn ../asm-$(HEADER_ARCH) $@
+	$(Q)ln -fsn ../../../../include/asm-$(HEADER_ARCH) $@
 endif
 
 $(objtree)/$(ARCH_DIR)/include/shared:
@@ -209,6 +210,6 @@ $(ARCH_DIR)/include/shared/user_constants.h: $(ARCH_DIR)/sys-$(SUBARCH)/user-off
 
 $(ARCH_DIR)/include/shared/kern_constants.h: $(objtree)/$(ARCH_DIR)/include/shared
 	@echo '  SYMLINK $@'
-	$(Q)ln -sf ../../../../include/asm-um/asm-offsets.h $@
+	$(Q)ln -sf ../../../../include/asm/asm-offsets.h $@
 
 export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH
diff --git a/include/asm-um/a.out-core.h b/arch/um/include/asm/a.out-core.h
similarity index 100%
rename from include/asm-um/a.out-core.h
rename to arch/um/include/asm/a.out-core.h
diff --git a/include/asm-um/a.out.h b/arch/um/include/asm/a.out.h
similarity index 100%
rename from include/asm-um/a.out.h
rename to arch/um/include/asm/a.out.h
diff --git a/include/asm-um/alternative-asm.h b/arch/um/include/asm/alternative-asm.h
similarity index 100%
rename from include/asm-um/alternative-asm.h
rename to arch/um/include/asm/alternative-asm.h
diff --git a/include/asm-um/alternative.h b/arch/um/include/asm/alternative.h
similarity index 100%
rename from include/asm-um/alternative.h
rename to arch/um/include/asm/alternative.h
diff --git a/include/asm-um/apic.h b/arch/um/include/asm/apic.h
similarity index 100%
rename from include/asm-um/apic.h
rename to arch/um/include/asm/apic.h
diff --git a/include/asm-um/archparam-i386.h b/arch/um/include/asm/archparam-i386.h
similarity index 100%
rename from include/asm-um/archparam-i386.h
rename to arch/um/include/asm/archparam-i386.h
diff --git a/include/asm-um/archparam-ppc.h b/arch/um/include/asm/archparam-ppc.h
similarity index 100%
rename from include/asm-um/archparam-ppc.h
rename to arch/um/include/asm/archparam-ppc.h
diff --git a/include/asm-um/archparam-x86_64.h b/arch/um/include/asm/archparam-x86_64.h
similarity index 100%
rename from include/asm-um/archparam-x86_64.h
rename to arch/um/include/asm/archparam-x86_64.h
diff --git a/include/asm-um/asm.h b/arch/um/include/asm/asm.h
similarity index 100%
rename from include/asm-um/asm.h
rename to arch/um/include/asm/asm.h
diff --git a/include/asm-um/atomic.h b/arch/um/include/asm/atomic.h
similarity index 100%
rename from include/asm-um/atomic.h
rename to arch/um/include/asm/atomic.h
diff --git a/include/asm-um/auxvec.h b/arch/um/include/asm/auxvec.h
similarity index 100%
rename from include/asm-um/auxvec.h
rename to arch/um/include/asm/auxvec.h
diff --git a/include/asm-um/bitops.h b/arch/um/include/asm/bitops.h
similarity index 100%
rename from include/asm-um/bitops.h
rename to arch/um/include/asm/bitops.h
diff --git a/include/asm-um/boot.h b/arch/um/include/asm/boot.h
similarity index 100%
rename from include/asm-um/boot.h
rename to arch/um/include/asm/boot.h
diff --git a/include/asm-um/bug.h b/arch/um/include/asm/bug.h
similarity index 100%
rename from include/asm-um/bug.h
rename to arch/um/include/asm/bug.h
diff --git a/include/asm-um/bugs.h b/arch/um/include/asm/bugs.h
similarity index 100%
rename from include/asm-um/bugs.h
rename to arch/um/include/asm/bugs.h
diff --git a/include/asm-um/byteorder.h b/arch/um/include/asm/byteorder.h
similarity index 100%
rename from include/asm-um/byteorder.h
rename to arch/um/include/asm/byteorder.h
diff --git a/include/asm-um/cache.h b/arch/um/include/asm/cache.h
similarity index 100%
rename from include/asm-um/cache.h
rename to arch/um/include/asm/cache.h
diff --git a/include/asm-um/cacheflush.h b/arch/um/include/asm/cacheflush.h
similarity index 100%
rename from include/asm-um/cacheflush.h
rename to arch/um/include/asm/cacheflush.h
diff --git a/include/asm-um/calling.h b/arch/um/include/asm/calling.h
similarity index 100%
rename from include/asm-um/calling.h
rename to arch/um/include/asm/calling.h
diff --git a/include/asm-um/checksum.h b/arch/um/include/asm/checksum.h
similarity index 100%
rename from include/asm-um/checksum.h
rename to arch/um/include/asm/checksum.h
diff --git a/include/asm-um/cmpxchg.h b/arch/um/include/asm/cmpxchg.h
similarity index 100%
rename from include/asm-um/cmpxchg.h
rename to arch/um/include/asm/cmpxchg.h
diff --git a/include/asm-um/cobalt.h b/arch/um/include/asm/cobalt.h
similarity index 100%
rename from include/asm-um/cobalt.h
rename to arch/um/include/asm/cobalt.h
diff --git a/include/asm-um/common.lds.S b/arch/um/include/asm/common.lds.S
similarity index 100%
rename from include/asm-um/common.lds.S
rename to arch/um/include/asm/common.lds.S
diff --git a/include/asm-um/cpufeature.h b/arch/um/include/asm/cpufeature.h
similarity index 100%
rename from include/asm-um/cpufeature.h
rename to arch/um/include/asm/cpufeature.h
diff --git a/include/asm-um/cputime.h b/arch/um/include/asm/cputime.h
similarity index 100%
rename from include/asm-um/cputime.h
rename to arch/um/include/asm/cputime.h
diff --git a/include/asm-um/current.h b/arch/um/include/asm/current.h
similarity index 100%
rename from include/asm-um/current.h
rename to arch/um/include/asm/current.h
diff --git a/include/asm-um/delay.h b/arch/um/include/asm/delay.h
similarity index 100%
rename from include/asm-um/delay.h
rename to arch/um/include/asm/delay.h
diff --git a/include/asm-um/desc.h b/arch/um/include/asm/desc.h
similarity index 100%
rename from include/asm-um/desc.h
rename to arch/um/include/asm/desc.h
diff --git a/include/asm-um/device.h b/arch/um/include/asm/device.h
similarity index 100%
rename from include/asm-um/device.h
rename to arch/um/include/asm/device.h
diff --git a/include/asm-um/div64.h b/arch/um/include/asm/div64.h
similarity index 100%
rename from include/asm-um/div64.h
rename to arch/um/include/asm/div64.h
diff --git a/include/asm-um/dma-mapping.h b/arch/um/include/asm/dma-mapping.h
similarity index 100%
rename from include/asm-um/dma-mapping.h
rename to arch/um/include/asm/dma-mapping.h
diff --git a/include/asm-um/dma.h b/arch/um/include/asm/dma.h
similarity index 100%
rename from include/asm-um/dma.h
rename to arch/um/include/asm/dma.h
diff --git a/include/asm-um/dwarf2.h b/arch/um/include/asm/dwarf2.h
similarity index 100%
rename from include/asm-um/dwarf2.h
rename to arch/um/include/asm/dwarf2.h
diff --git a/include/asm-um/elf-i386.h b/arch/um/include/asm/elf-i386.h
similarity index 100%
rename from include/asm-um/elf-i386.h
rename to arch/um/include/asm/elf-i386.h
diff --git a/include/asm-um/elf-ppc.h b/arch/um/include/asm/elf-ppc.h
similarity index 100%
rename from include/asm-um/elf-ppc.h
rename to arch/um/include/asm/elf-ppc.h
diff --git a/include/asm-um/elf-x86_64.h b/arch/um/include/asm/elf-x86_64.h
similarity index 100%
rename from include/asm-um/elf-x86_64.h
rename to arch/um/include/asm/elf-x86_64.h
diff --git a/include/asm-um/emergency-restart.h b/arch/um/include/asm/emergency-restart.h
similarity index 100%
rename from include/asm-um/emergency-restart.h
rename to arch/um/include/asm/emergency-restart.h
diff --git a/include/asm-um/errno.h b/arch/um/include/asm/errno.h
similarity index 100%
rename from include/asm-um/errno.h
rename to arch/um/include/asm/errno.h
diff --git a/include/asm-um/fcntl.h b/arch/um/include/asm/fcntl.h
similarity index 100%
rename from include/asm-um/fcntl.h
rename to arch/um/include/asm/fcntl.h
diff --git a/include/asm-um/fixmap.h b/arch/um/include/asm/fixmap.h
similarity index 100%
rename from include/asm-um/fixmap.h
rename to arch/um/include/asm/fixmap.h
diff --git a/include/asm-um/floppy.h b/arch/um/include/asm/floppy.h
similarity index 100%
rename from include/asm-um/floppy.h
rename to arch/um/include/asm/floppy.h
diff --git a/include/asm-um/frame.h b/arch/um/include/asm/frame.h
similarity index 100%
rename from include/asm-um/frame.h
rename to arch/um/include/asm/frame.h
diff --git a/include/asm-um/futex.h b/arch/um/include/asm/futex.h
similarity index 100%
rename from include/asm-um/futex.h
rename to arch/um/include/asm/futex.h
diff --git a/include/asm-um/hardirq.h b/arch/um/include/asm/hardirq.h
similarity index 100%
rename from include/asm-um/hardirq.h
rename to arch/um/include/asm/hardirq.h
diff --git a/include/asm-um/highmem.h b/arch/um/include/asm/highmem.h
similarity index 100%
rename from include/asm-um/highmem.h
rename to arch/um/include/asm/highmem.h
diff --git a/include/asm-um/host_ldt-i386.h b/arch/um/include/asm/host_ldt-i386.h
similarity index 100%
rename from include/asm-um/host_ldt-i386.h
rename to arch/um/include/asm/host_ldt-i386.h
diff --git a/include/asm-um/host_ldt-x86_64.h b/arch/um/include/asm/host_ldt-x86_64.h
similarity index 100%
rename from include/asm-um/host_ldt-x86_64.h
rename to arch/um/include/asm/host_ldt-x86_64.h
diff --git a/include/asm-um/hw_irq.h b/arch/um/include/asm/hw_irq.h
similarity index 100%
rename from include/asm-um/hw_irq.h
rename to arch/um/include/asm/hw_irq.h
diff --git a/include/asm-um/ide.h b/arch/um/include/asm/ide.h
similarity index 100%
rename from include/asm-um/ide.h
rename to arch/um/include/asm/ide.h
diff --git a/include/asm-um/io.h b/arch/um/include/asm/io.h
similarity index 100%
rename from include/asm-um/io.h
rename to arch/um/include/asm/io.h
diff --git a/include/asm-um/ioctl.h b/arch/um/include/asm/ioctl.h
similarity index 100%
rename from include/asm-um/ioctl.h
rename to arch/um/include/asm/ioctl.h
diff --git a/include/asm-um/ioctls.h b/arch/um/include/asm/ioctls.h
similarity index 100%
rename from include/asm-um/ioctls.h
rename to arch/um/include/asm/ioctls.h
diff --git a/include/asm-um/ipcbuf.h b/arch/um/include/asm/ipcbuf.h
similarity index 100%
rename from include/asm-um/ipcbuf.h
rename to arch/um/include/asm/ipcbuf.h
diff --git a/include/asm-um/irq.h b/arch/um/include/asm/irq.h
similarity index 100%
rename from include/asm-um/irq.h
rename to arch/um/include/asm/irq.h
diff --git a/include/asm-um/irq_regs.h b/arch/um/include/asm/irq_regs.h
similarity index 100%
rename from include/asm-um/irq_regs.h
rename to arch/um/include/asm/irq_regs.h
diff --git a/include/asm-um/irq_vectors.h b/arch/um/include/asm/irq_vectors.h
similarity index 100%
rename from include/asm-um/irq_vectors.h
rename to arch/um/include/asm/irq_vectors.h
diff --git a/include/asm-um/irqflags.h b/arch/um/include/asm/irqflags.h
similarity index 100%
rename from include/asm-um/irqflags.h
rename to arch/um/include/asm/irqflags.h
diff --git a/include/asm-um/kdebug.h b/arch/um/include/asm/kdebug.h
similarity index 100%
rename from include/asm-um/kdebug.h
rename to arch/um/include/asm/kdebug.h
diff --git a/include/asm-um/kmap_types.h b/arch/um/include/asm/kmap_types.h
similarity index 100%
rename from include/asm-um/kmap_types.h
rename to arch/um/include/asm/kmap_types.h
diff --git a/include/asm-um/ldt.h b/arch/um/include/asm/ldt.h
similarity index 100%
rename from include/asm-um/ldt.h
rename to arch/um/include/asm/ldt.h
diff --git a/include/asm-um/linkage.h b/arch/um/include/asm/linkage.h
similarity index 100%
rename from include/asm-um/linkage.h
rename to arch/um/include/asm/linkage.h
diff --git a/include/asm-um/local.h b/arch/um/include/asm/local.h
similarity index 100%
rename from include/asm-um/local.h
rename to arch/um/include/asm/local.h
diff --git a/include/asm-um/locks.h b/arch/um/include/asm/locks.h
similarity index 100%
rename from include/asm-um/locks.h
rename to arch/um/include/asm/locks.h
diff --git a/include/asm-um/mca_dma.h b/arch/um/include/asm/mca_dma.h
similarity index 100%
rename from include/asm-um/mca_dma.h
rename to arch/um/include/asm/mca_dma.h
diff --git a/include/asm-um/mman.h b/arch/um/include/asm/mman.h
similarity index 100%
rename from include/asm-um/mman.h
rename to arch/um/include/asm/mman.h
diff --git a/include/asm-um/mmu.h b/arch/um/include/asm/mmu.h
similarity index 100%
rename from include/asm-um/mmu.h
rename to arch/um/include/asm/mmu.h
diff --git a/include/asm-um/mmu_context.h b/arch/um/include/asm/mmu_context.h
similarity index 100%
rename from include/asm-um/mmu_context.h
rename to arch/um/include/asm/mmu_context.h
diff --git a/include/asm-um/module-generic.h b/arch/um/include/asm/module-generic.h
similarity index 100%
rename from include/asm-um/module-generic.h
rename to arch/um/include/asm/module-generic.h
diff --git a/include/asm-um/module-i386.h b/arch/um/include/asm/module-i386.h
similarity index 100%
rename from include/asm-um/module-i386.h
rename to arch/um/include/asm/module-i386.h
diff --git a/include/asm-um/module-x86_64.h b/arch/um/include/asm/module-x86_64.h
similarity index 100%
rename from include/asm-um/module-x86_64.h
rename to arch/um/include/asm/module-x86_64.h
diff --git a/include/asm-um/msgbuf.h b/arch/um/include/asm/msgbuf.h
similarity index 100%
rename from include/asm-um/msgbuf.h
rename to arch/um/include/asm/msgbuf.h
diff --git a/include/asm-um/mtrr.h b/arch/um/include/asm/mtrr.h
similarity index 100%
rename from include/asm-um/mtrr.h
rename to arch/um/include/asm/mtrr.h
diff --git a/include/asm-um/mutex.h b/arch/um/include/asm/mutex.h
similarity index 100%
rename from include/asm-um/mutex.h
rename to arch/um/include/asm/mutex.h
diff --git a/include/asm-um/nops.h b/arch/um/include/asm/nops.h
similarity index 100%
rename from include/asm-um/nops.h
rename to arch/um/include/asm/nops.h
diff --git a/include/asm-um/page.h b/arch/um/include/asm/page.h
similarity index 100%
rename from include/asm-um/page.h
rename to arch/um/include/asm/page.h
diff --git a/include/asm-um/page_offset.h b/arch/um/include/asm/page_offset.h
similarity index 100%
rename from include/asm-um/page_offset.h
rename to arch/um/include/asm/page_offset.h
diff --git a/include/asm-um/param.h b/arch/um/include/asm/param.h
similarity index 100%
rename from include/asm-um/param.h
rename to arch/um/include/asm/param.h
diff --git a/include/asm-um/paravirt.h b/arch/um/include/asm/paravirt.h
similarity index 100%
rename from include/asm-um/paravirt.h
rename to arch/um/include/asm/paravirt.h
diff --git a/include/asm-um/pci.h b/arch/um/include/asm/pci.h
similarity index 100%
rename from include/asm-um/pci.h
rename to arch/um/include/asm/pci.h
diff --git a/include/asm-um/pda.h b/arch/um/include/asm/pda.h
similarity index 100%
rename from include/asm-um/pda.h
rename to arch/um/include/asm/pda.h
diff --git a/include/asm-um/percpu.h b/arch/um/include/asm/percpu.h
similarity index 100%
rename from include/asm-um/percpu.h
rename to arch/um/include/asm/percpu.h
diff --git a/include/asm-um/pgalloc.h b/arch/um/include/asm/pgalloc.h
similarity index 100%
rename from include/asm-um/pgalloc.h
rename to arch/um/include/asm/pgalloc.h
diff --git a/include/asm-um/pgtable-2level.h b/arch/um/include/asm/pgtable-2level.h
similarity index 100%
rename from include/asm-um/pgtable-2level.h
rename to arch/um/include/asm/pgtable-2level.h
diff --git a/include/asm-um/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
similarity index 100%
rename from include/asm-um/pgtable-3level.h
rename to arch/um/include/asm/pgtable-3level.h
diff --git a/include/asm-um/pgtable.h b/arch/um/include/asm/pgtable.h
similarity index 100%
rename from include/asm-um/pgtable.h
rename to arch/um/include/asm/pgtable.h
diff --git a/include/asm-um/poll.h b/arch/um/include/asm/poll.h
similarity index 100%
rename from include/asm-um/poll.h
rename to arch/um/include/asm/poll.h
diff --git a/include/asm-um/posix_types.h b/arch/um/include/asm/posix_types.h
similarity index 100%
rename from include/asm-um/posix_types.h
rename to arch/um/include/asm/posix_types.h
diff --git a/include/asm-um/prctl.h b/arch/um/include/asm/prctl.h
similarity index 100%
rename from include/asm-um/prctl.h
rename to arch/um/include/asm/prctl.h
diff --git a/include/asm-um/processor-generic.h b/arch/um/include/asm/processor-generic.h
similarity index 100%
rename from include/asm-um/processor-generic.h
rename to arch/um/include/asm/processor-generic.h
diff --git a/include/asm-um/processor-i386.h b/arch/um/include/asm/processor-i386.h
similarity index 100%
rename from include/asm-um/processor-i386.h
rename to arch/um/include/asm/processor-i386.h
diff --git a/include/asm-um/processor-ppc.h b/arch/um/include/asm/processor-ppc.h
similarity index 100%
rename from include/asm-um/processor-ppc.h
rename to arch/um/include/asm/processor-ppc.h
diff --git a/include/asm-um/processor-x86_64.h b/arch/um/include/asm/processor-x86_64.h
similarity index 100%
rename from include/asm-um/processor-x86_64.h
rename to arch/um/include/asm/processor-x86_64.h
diff --git a/include/asm-um/ptrace-generic.h b/arch/um/include/asm/ptrace-generic.h
similarity index 100%
rename from include/asm-um/ptrace-generic.h
rename to arch/um/include/asm/ptrace-generic.h
diff --git a/include/asm-um/ptrace-i386.h b/arch/um/include/asm/ptrace-i386.h
similarity index 100%
rename from include/asm-um/ptrace-i386.h
rename to arch/um/include/asm/ptrace-i386.h
diff --git a/include/asm-um/ptrace-x86_64.h b/arch/um/include/asm/ptrace-x86_64.h
similarity index 100%
rename from include/asm-um/ptrace-x86_64.h
rename to arch/um/include/asm/ptrace-x86_64.h
diff --git a/include/asm-um/required-features.h b/arch/um/include/asm/required-features.h
similarity index 100%
rename from include/asm-um/required-features.h
rename to arch/um/include/asm/required-features.h
diff --git a/include/asm-um/resource.h b/arch/um/include/asm/resource.h
similarity index 100%
rename from include/asm-um/resource.h
rename to arch/um/include/asm/resource.h
diff --git a/include/asm-um/rwlock.h b/arch/um/include/asm/rwlock.h
similarity index 100%
rename from include/asm-um/rwlock.h
rename to arch/um/include/asm/rwlock.h
diff --git a/include/asm-um/rwsem.h b/arch/um/include/asm/rwsem.h
similarity index 100%
rename from include/asm-um/rwsem.h
rename to arch/um/include/asm/rwsem.h
diff --git a/include/asm-um/scatterlist.h b/arch/um/include/asm/scatterlist.h
similarity index 100%
rename from include/asm-um/scatterlist.h
rename to arch/um/include/asm/scatterlist.h
diff --git a/include/asm-um/sections.h b/arch/um/include/asm/sections.h
similarity index 100%
rename from include/asm-um/sections.h
rename to arch/um/include/asm/sections.h
diff --git a/include/asm-um/segment.h b/arch/um/include/asm/segment.h
similarity index 100%
rename from include/asm-um/segment.h
rename to arch/um/include/asm/segment.h
diff --git a/include/asm-um/sembuf.h b/arch/um/include/asm/sembuf.h
similarity index 100%
rename from include/asm-um/sembuf.h
rename to arch/um/include/asm/sembuf.h
diff --git a/include/asm-um/serial.h b/arch/um/include/asm/serial.h
similarity index 100%
rename from include/asm-um/serial.h
rename to arch/um/include/asm/serial.h
diff --git a/include/asm-um/setup.h b/arch/um/include/asm/setup.h
similarity index 100%
rename from include/asm-um/setup.h
rename to arch/um/include/asm/setup.h
diff --git a/include/asm-um/shmbuf.h b/arch/um/include/asm/shmbuf.h
similarity index 100%
rename from include/asm-um/shmbuf.h
rename to arch/um/include/asm/shmbuf.h
diff --git a/include/asm-um/shmparam.h b/arch/um/include/asm/shmparam.h
similarity index 100%
rename from include/asm-um/shmparam.h
rename to arch/um/include/asm/shmparam.h
diff --git a/include/asm-um/sigcontext-generic.h b/arch/um/include/asm/sigcontext-generic.h
similarity index 100%
rename from include/asm-um/sigcontext-generic.h
rename to arch/um/include/asm/sigcontext-generic.h
diff --git a/include/asm-um/sigcontext-i386.h b/arch/um/include/asm/sigcontext-i386.h
similarity index 100%
rename from include/asm-um/sigcontext-i386.h
rename to arch/um/include/asm/sigcontext-i386.h
diff --git a/include/asm-um/sigcontext-ppc.h b/arch/um/include/asm/sigcontext-ppc.h
similarity index 100%
rename from include/asm-um/sigcontext-ppc.h
rename to arch/um/include/asm/sigcontext-ppc.h
diff --git a/include/asm-um/sigcontext-x86_64.h b/arch/um/include/asm/sigcontext-x86_64.h
similarity index 100%
rename from include/asm-um/sigcontext-x86_64.h
rename to arch/um/include/asm/sigcontext-x86_64.h
diff --git a/include/asm-um/siginfo.h b/arch/um/include/asm/siginfo.h
similarity index 100%
rename from include/asm-um/siginfo.h
rename to arch/um/include/asm/siginfo.h
diff --git a/include/asm-um/signal.h b/arch/um/include/asm/signal.h
similarity index 100%
rename from include/asm-um/signal.h
rename to arch/um/include/asm/signal.h
diff --git a/include/asm-um/smp.h b/arch/um/include/asm/smp.h
similarity index 100%
rename from include/asm-um/smp.h
rename to arch/um/include/asm/smp.h
diff --git a/include/asm-um/socket.h b/arch/um/include/asm/socket.h
similarity index 100%
rename from include/asm-um/socket.h
rename to arch/um/include/asm/socket.h
diff --git a/include/asm-um/sockios.h b/arch/um/include/asm/sockios.h
similarity index 100%
rename from include/asm-um/sockios.h
rename to arch/um/include/asm/sockios.h
diff --git a/include/asm-um/spinlock.h b/arch/um/include/asm/spinlock.h
similarity index 100%
rename from include/asm-um/spinlock.h
rename to arch/um/include/asm/spinlock.h
diff --git a/include/asm-um/spinlock_types.h b/arch/um/include/asm/spinlock_types.h
similarity index 100%
rename from include/asm-um/spinlock_types.h
rename to arch/um/include/asm/spinlock_types.h
diff --git a/include/asm-um/stat.h b/arch/um/include/asm/stat.h
similarity index 100%
rename from include/asm-um/stat.h
rename to arch/um/include/asm/stat.h
diff --git a/include/asm-um/statfs.h b/arch/um/include/asm/statfs.h
similarity index 100%
rename from include/asm-um/statfs.h
rename to arch/um/include/asm/statfs.h
diff --git a/include/asm-um/string.h b/arch/um/include/asm/string.h
similarity index 100%
rename from include/asm-um/string.h
rename to arch/um/include/asm/string.h
diff --git a/include/asm-um/suspend.h b/arch/um/include/asm/suspend.h
similarity index 100%
rename from include/asm-um/suspend.h
rename to arch/um/include/asm/suspend.h
diff --git a/include/asm-um/system-generic.h b/arch/um/include/asm/system-generic.h
similarity index 100%
rename from include/asm-um/system-generic.h
rename to arch/um/include/asm/system-generic.h
diff --git a/include/asm-um/system-i386.h b/arch/um/include/asm/system-i386.h
similarity index 100%
rename from include/asm-um/system-i386.h
rename to arch/um/include/asm/system-i386.h
diff --git a/include/asm-um/system-ppc.h b/arch/um/include/asm/system-ppc.h
similarity index 100%
rename from include/asm-um/system-ppc.h
rename to arch/um/include/asm/system-ppc.h
diff --git a/include/asm-um/system-x86_64.h b/arch/um/include/asm/system-x86_64.h
similarity index 100%
rename from include/asm-um/system-x86_64.h
rename to arch/um/include/asm/system-x86_64.h
diff --git a/include/asm-um/termbits.h b/arch/um/include/asm/termbits.h
similarity index 100%
rename from include/asm-um/termbits.h
rename to arch/um/include/asm/termbits.h
diff --git a/include/asm-um/termios.h b/arch/um/include/asm/termios.h
similarity index 100%
rename from include/asm-um/termios.h
rename to arch/um/include/asm/termios.h
diff --git a/include/asm-um/thread_info.h b/arch/um/include/asm/thread_info.h
similarity index 100%
rename from include/asm-um/thread_info.h
rename to arch/um/include/asm/thread_info.h
diff --git a/include/asm-um/timex.h b/arch/um/include/asm/timex.h
similarity index 100%
rename from include/asm-um/timex.h
rename to arch/um/include/asm/timex.h
diff --git a/include/asm-um/tlb.h b/arch/um/include/asm/tlb.h
similarity index 100%
rename from include/asm-um/tlb.h
rename to arch/um/include/asm/tlb.h
diff --git a/include/asm-um/tlbflush.h b/arch/um/include/asm/tlbflush.h
similarity index 100%
rename from include/asm-um/tlbflush.h
rename to arch/um/include/asm/tlbflush.h
diff --git a/include/asm-um/topology.h b/arch/um/include/asm/topology.h
similarity index 100%
rename from include/asm-um/topology.h
rename to arch/um/include/asm/topology.h
diff --git a/include/asm-um/types.h b/arch/um/include/asm/types.h
similarity index 100%
rename from include/asm-um/types.h
rename to arch/um/include/asm/types.h
diff --git a/include/asm-um/uaccess.h b/arch/um/include/asm/uaccess.h
similarity index 100%
rename from include/asm-um/uaccess.h
rename to arch/um/include/asm/uaccess.h
diff --git a/include/asm-um/ucontext.h b/arch/um/include/asm/ucontext.h
similarity index 100%
rename from include/asm-um/ucontext.h
rename to arch/um/include/asm/ucontext.h
diff --git a/include/asm-um/unaligned.h b/arch/um/include/asm/unaligned.h
similarity index 100%
rename from include/asm-um/unaligned.h
rename to arch/um/include/asm/unaligned.h
diff --git a/include/asm-um/unistd.h b/arch/um/include/asm/unistd.h
similarity index 100%
rename from include/asm-um/unistd.h
rename to arch/um/include/asm/unistd.h
diff --git a/include/asm-um/user.h b/arch/um/include/asm/user.h
similarity index 100%
rename from include/asm-um/user.h
rename to arch/um/include/asm/user.h
diff --git a/include/asm-um/vga.h b/arch/um/include/asm/vga.h
similarity index 100%
rename from include/asm-um/vga.h
rename to arch/um/include/asm/vga.h
diff --git a/include/asm-um/vm-flags-i386.h b/arch/um/include/asm/vm-flags-i386.h
similarity index 100%
rename from include/asm-um/vm-flags-i386.h
rename to arch/um/include/asm/vm-flags-i386.h
diff --git a/include/asm-um/vm-flags-x86_64.h b/arch/um/include/asm/vm-flags-x86_64.h
similarity index 100%
rename from include/asm-um/vm-flags-x86_64.h
rename to arch/um/include/asm/vm-flags-x86_64.h
diff --git a/include/asm-um/vm86.h b/arch/um/include/asm/vm86.h
similarity index 100%
rename from include/asm-um/vm86.h
rename to arch/um/include/asm/vm86.h
diff --git a/include/asm-um/xor.h b/arch/um/include/asm/xor.h
similarity index 100%
rename from include/asm-um/xor.h
rename to arch/um/include/asm/xor.h