145 files changed, 9 insertions, 8 deletions
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)mkdir -p $(objtree)/$(ARCH_DIR)/include/asm
-        $(Q)ln -fsn $(srctree)/include/asm-um/$(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@
+        $(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
index 995643b18309..995643b18309 100644
--- a/include/asm-um/a.out-core.h
+++ b/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
index 754181ee8683..754181ee8683 100644
--- a/include/asm-um/a.out.h
+++ b/arch/um/include/asm/a.out.h
diff --git a/include/asm-um/alternative-asm.h b/arch/um/include/asm/alternative-asm.h
index 9aa9fa2402a4..9aa9fa2402a4 100644
--- a/include/asm-um/alternative-asm.h
+++ b/arch/um/include/asm/alternative-asm.h
diff --git a/include/asm-um/alternative.h b/arch/um/include/asm/alternative.h
index b6434396bd42..b6434396bd42 100644
--- a/include/asm-um/alternative.h
+++ b/arch/um/include/asm/alternative.h
diff --git a/include/asm-um/apic.h b/arch/um/include/asm/apic.h
index 876dee84ab11..876dee84ab11 100644
--- a/include/asm-um/apic.h
+++ b/arch/um/include/asm/apic.h
diff --git a/include/asm-um/archparam-i386.h b/arch/um/include/asm/archparam-i386.h
index 49e89b8d7e58..49e89b8d7e58 100644
--- a/include/asm-um/archparam-i386.h
+++ b/arch/um/include/asm/archparam-i386.h
diff --git a/include/asm-um/archparam-ppc.h b/arch/um/include/asm/archparam-ppc.h
index 4269d8a37b4f..4269d8a37b4f 100644
--- a/include/asm-um/archparam-ppc.h
+++ b/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
index 270ed9586b68..270ed9586b68 100644
--- a/include/asm-um/archparam-x86_64.h
+++ b/arch/um/include/asm/archparam-x86_64.h
diff --git a/include/asm-um/asm.h b/arch/um/include/asm/asm.h
index af1269a1e9eb..af1269a1e9eb 100644
--- a/include/asm-um/asm.h
+++ b/arch/um/include/asm/asm.h
diff --git a/include/asm-um/atomic.h b/arch/um/include/asm/atomic.h
index b683f1034d1e..b683f1034d1e 100644
--- a/include/asm-um/atomic.h
+++ b/arch/um/include/asm/atomic.h
diff --git a/include/asm-um/auxvec.h b/arch/um/include/asm/auxvec.h
index 1e5e1c2fc9b1..1e5e1c2fc9b1 100644
--- a/include/asm-um/auxvec.h
+++ b/arch/um/include/asm/auxvec.h
diff --git a/include/asm-um/bitops.h b/arch/um/include/asm/bitops.h
index e4d38d437b97..e4d38d437b97 100644
--- a/include/asm-um/bitops.h
+++ b/arch/um/include/asm/bitops.h
diff --git a/include/asm-um/boot.h b/arch/um/include/asm/boot.h
index 09548c3e784e..09548c3e784e 100644
--- a/include/asm-um/boot.h
+++ b/arch/um/include/asm/boot.h
diff --git a/include/asm-um/bug.h b/arch/um/include/asm/bug.h
index 9e33b864c359..9e33b864c359 100644
--- a/include/asm-um/bug.h
+++ b/arch/um/include/asm/bug.h
diff --git a/include/asm-um/bugs.h b/arch/um/include/asm/bugs.h
index 6a72e240d5fc..6a72e240d5fc 100644
--- a/include/asm-um/bugs.h
+++ b/arch/um/include/asm/bugs.h
diff --git a/include/asm-um/byteorder.h b/arch/um/include/asm/byteorder.h
index eee0a834f447..eee0a834f447 100644
--- a/include/asm-um/byteorder.h
+++ b/arch/um/include/asm/byteorder.h
diff --git a/include/asm-um/cache.h b/arch/um/include/asm/cache.h
index 19e1bdd67416..19e1bdd67416 100644
--- a/include/asm-um/cache.h
+++ b/arch/um/include/asm/cache.h
diff --git a/include/asm-um/cacheflush.h b/arch/um/include/asm/cacheflush.h
index 12e9d4b74c8f..12e9d4b74c8f 100644
--- a/include/asm-um/cacheflush.h
+++ b/arch/um/include/asm/cacheflush.h
diff --git a/include/asm-um/calling.h b/arch/um/include/asm/calling.h
index 0b2384cc99fd..0b2384cc99fd 100644
--- a/include/asm-um/calling.h
+++ b/arch/um/include/asm/calling.h
diff --git a/include/asm-um/checksum.h b/arch/um/include/asm/checksum.h
index 5b501361e361..5b501361e361 100644
--- a/include/asm-um/checksum.h
+++ b/arch/um/include/asm/checksum.h
diff --git a/include/asm-um/cmpxchg.h b/arch/um/include/asm/cmpxchg.h
index 529376a99885..529376a99885 100644
--- a/include/asm-um/cmpxchg.h
+++ b/arch/um/include/asm/cmpxchg.h
diff --git a/include/asm-um/cobalt.h b/arch/um/include/asm/cobalt.h
index f813a684be98..f813a684be98 100644
--- a/include/asm-um/cobalt.h
+++ b/arch/um/include/asm/cobalt.h
diff --git a/include/asm-um/common.lds.S b/arch/um/include/asm/common.lds.S
index cb0248616d49..cb0248616d49 100644
--- a/include/asm-um/common.lds.S
+++ b/arch/um/include/asm/common.lds.S
diff --git a/include/asm-um/cpufeature.h b/arch/um/include/asm/cpufeature.h
index fb7bd42a4d96..fb7bd42a4d96 100644
--- a/include/asm-um/cpufeature.h
+++ b/arch/um/include/asm/cpufeature.h
diff --git a/include/asm-um/cputime.h b/arch/um/include/asm/cputime.h
index c84acbadfa2f..c84acbadfa2f 100644
--- a/include/asm-um/cputime.h
+++ b/arch/um/include/asm/cputime.h
diff --git a/include/asm-um/current.h b/arch/um/include/asm/current.h
index c2191d9aa03d..c2191d9aa03d 100644
--- a/include/asm-um/current.h
+++ b/arch/um/include/asm/current.h
diff --git a/include/asm-um/delay.h b/arch/um/include/asm/delay.h
index c71e32b6741e..c71e32b6741e 100644
--- a/include/asm-um/delay.h
+++ b/arch/um/include/asm/delay.h
diff --git a/include/asm-um/desc.h b/arch/um/include/asm/desc.h
index 4ec34a51b62c..4ec34a51b62c 100644
--- a/include/asm-um/desc.h
+++ b/arch/um/include/asm/desc.h
diff --git a/include/asm-um/device.h b/arch/um/include/asm/device.h
index d8f9872b0e2d..d8f9872b0e2d 100644
--- a/include/asm-um/device.h
+++ b/arch/um/include/asm/device.h
diff --git a/include/asm-um/div64.h b/arch/um/include/asm/div64.h
index 1e17f7409cab..1e17f7409cab 100644
--- a/include/asm-um/div64.h
+++ b/arch/um/include/asm/div64.h
diff --git a/include/asm-um/dma-mapping.h b/arch/um/include/asm/dma-mapping.h
index 90fc708b320e..90fc708b320e 100644
--- a/include/asm-um/dma-mapping.h
+++ b/arch/um/include/asm/dma-mapping.h
diff --git a/include/asm-um/dma.h b/arch/um/include/asm/dma.h
index 9f6139a8a525..9f6139a8a525 100644
--- a/include/asm-um/dma.h
+++ b/arch/um/include/asm/dma.h
diff --git a/include/asm-um/dwarf2.h b/arch/um/include/asm/dwarf2.h
index d1a02e762931..d1a02e762931 100644
--- a/include/asm-um/dwarf2.h
+++ b/arch/um/include/asm/dwarf2.h
diff --git a/include/asm-um/elf-i386.h b/arch/um/include/asm/elf-i386.h
index d0da9d7c5371..d0da9d7c5371 100644
--- a/include/asm-um/elf-i386.h
+++ b/arch/um/include/asm/elf-i386.h
diff --git a/include/asm-um/elf-ppc.h b/arch/um/include/asm/elf-ppc.h
index af9463cd8ce5..af9463cd8ce5 100644
--- a/include/asm-um/elf-ppc.h
+++ b/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
index 6e8a9195e952..6e8a9195e952 100644
--- a/include/asm-um/elf-x86_64.h
+++ b/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
index 108d8c48e42e..108d8c48e42e 100644
--- a/include/asm-um/emergency-restart.h
+++ b/arch/um/include/asm/emergency-restart.h
diff --git a/include/asm-um/errno.h b/arch/um/include/asm/errno.h
index b7a9e37fd8d8..b7a9e37fd8d8 100644
--- a/include/asm-um/errno.h
+++ b/arch/um/include/asm/errno.h
diff --git a/include/asm-um/fcntl.h b/arch/um/include/asm/fcntl.h
index 812a65446d92..812a65446d92 100644
--- a/include/asm-um/fcntl.h
+++ b/arch/um/include/asm/fcntl.h
diff --git a/include/asm-um/fixmap.h b/arch/um/include/asm/fixmap.h
index 9d2be52b8655..9d2be52b8655 100644
--- a/include/asm-um/fixmap.h
+++ b/arch/um/include/asm/fixmap.h
diff --git a/include/asm-um/floppy.h b/arch/um/include/asm/floppy.h
index 453e7415fb6f..453e7415fb6f 100644
--- a/include/asm-um/floppy.h
+++ b/arch/um/include/asm/floppy.h
diff --git a/include/asm-um/frame.h b/arch/um/include/asm/frame.h
index 8a8c1cb415b4..8a8c1cb415b4 100644
--- a/include/asm-um/frame.h
+++ b/arch/um/include/asm/frame.h
diff --git a/include/asm-um/futex.h b/arch/um/include/asm/futex.h
index 6a332a9f099c..6a332a9f099c 100644
--- a/include/asm-um/futex.h
+++ b/arch/um/include/asm/futex.h
diff --git a/include/asm-um/hardirq.h b/arch/um/include/asm/hardirq.h
index 313ebb8a2566..313ebb8a2566 100644
--- a/include/asm-um/hardirq.h
+++ b/arch/um/include/asm/hardirq.h
diff --git a/include/asm-um/highmem.h b/arch/um/include/asm/highmem.h
index 36974cb8abc7..36974cb8abc7 100644
--- a/include/asm-um/highmem.h
+++ b/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
index b27cb0a9dd30..b27cb0a9dd30 100644
--- a/include/asm-um/host_ldt-i386.h
+++ b/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
index 74a63f7d9a90..74a63f7d9a90 100644
--- a/include/asm-um/host_ldt-x86_64.h
+++ b/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
index 1cf84cf5f21a..1cf84cf5f21a 100644
--- a/include/asm-um/hw_irq.h
+++ b/arch/um/include/asm/hw_irq.h
diff --git a/include/asm-um/ide.h b/arch/um/include/asm/ide.h
index 3d1ccebcfbaf..3d1ccebcfbaf 100644
--- a/include/asm-um/ide.h
+++ b/arch/um/include/asm/ide.h
diff --git a/include/asm-um/io.h b/arch/um/include/asm/io.h
index 44e8b8c772ae..44e8b8c772ae 100644
--- a/include/asm-um/io.h
+++ b/arch/um/include/asm/io.h
diff --git a/include/asm-um/ioctl.h b/arch/um/include/asm/ioctl.h
index cc22157346db..cc22157346db 100644
--- a/include/asm-um/ioctl.h
+++ b/arch/um/include/asm/ioctl.h
diff --git a/include/asm-um/ioctls.h b/arch/um/include/asm/ioctls.h
index 9a1a017de6a7..9a1a017de6a7 100644
--- a/include/asm-um/ioctls.h
+++ b/arch/um/include/asm/ioctls.h
diff --git a/include/asm-um/ipcbuf.h b/arch/um/include/asm/ipcbuf.h
index bb2ad31dc434..bb2ad31dc434 100644
--- a/include/asm-um/ipcbuf.h
+++ b/arch/um/include/asm/ipcbuf.h
diff --git a/include/asm-um/irq.h b/arch/um/include/asm/irq.h
index 4a2037f8204b..4a2037f8204b 100644
--- a/include/asm-um/irq.h
+++ b/arch/um/include/asm/irq.h
diff --git a/include/asm-um/irq_regs.h b/arch/um/include/asm/irq_regs.h
index 3dd9c0b70270..3dd9c0b70270 100644
--- a/include/asm-um/irq_regs.h
+++ b/arch/um/include/asm/irq_regs.h
diff --git a/include/asm-um/irq_vectors.h b/arch/um/include/asm/irq_vectors.h
index 62ddba6fc733..62ddba6fc733 100644
--- a/include/asm-um/irq_vectors.h
+++ b/arch/um/include/asm/irq_vectors.h
diff --git a/include/asm-um/irqflags.h b/arch/um/include/asm/irqflags.h
index 659b9abdfdba..659b9abdfdba 100644
--- a/include/asm-um/irqflags.h
+++ b/arch/um/include/asm/irqflags.h
diff --git a/include/asm-um/kdebug.h b/arch/um/include/asm/kdebug.h
index 6ece1b037665..6ece1b037665 100644
--- a/include/asm-um/kdebug.h
+++ b/arch/um/include/asm/kdebug.h
diff --git a/include/asm-um/kmap_types.h b/arch/um/include/asm/kmap_types.h
index 6c03acdb4405..6c03acdb4405 100644
--- a/include/asm-um/kmap_types.h
+++ b/arch/um/include/asm/kmap_types.h
diff --git a/include/asm-um/ldt.h b/arch/um/include/asm/ldt.h
index 52af512f5e7d..52af512f5e7d 100644
--- a/include/asm-um/ldt.h
+++ b/arch/um/include/asm/ldt.h
diff --git a/include/asm-um/linkage.h b/arch/um/include/asm/linkage.h
index 7dfce37adc8b..7dfce37adc8b 100644
--- a/include/asm-um/linkage.h
+++ b/arch/um/include/asm/linkage.h
diff --git a/include/asm-um/local.h b/arch/um/include/asm/local.h
index 9a280c5bb609..9a280c5bb609 100644
--- a/include/asm-um/local.h
+++ b/arch/um/include/asm/local.h
diff --git a/include/asm-um/locks.h b/arch/um/include/asm/locks.h
index f80030a3ef5a..f80030a3ef5a 100644
--- a/include/asm-um/locks.h
+++ b/arch/um/include/asm/locks.h
diff --git a/include/asm-um/mca_dma.h b/arch/um/include/asm/mca_dma.h
index e492e4ec1392..e492e4ec1392 100644
--- a/include/asm-um/mca_dma.h
+++ b/arch/um/include/asm/mca_dma.h
diff --git a/include/asm-um/mman.h b/arch/um/include/asm/mman.h
index b09ed523019b..b09ed523019b 100644
--- a/include/asm-um/mman.h
+++ b/arch/um/include/asm/mman.h
diff --git a/include/asm-um/mmu.h b/arch/um/include/asm/mmu.h
index 2cf35c21d694..2cf35c21d694 100644
--- a/include/asm-um/mmu.h
+++ b/arch/um/include/asm/mmu.h
diff --git a/include/asm-um/mmu_context.h b/arch/um/include/asm/mmu_context.h
index 54f42e8b0105..54f42e8b0105 100644
--- a/include/asm-um/mmu_context.h
+++ b/arch/um/include/asm/mmu_context.h
diff --git a/include/asm-um/module-generic.h b/arch/um/include/asm/module-generic.h
index 5a265f56b174..5a265f56b174 100644
--- a/include/asm-um/module-generic.h
+++ b/arch/um/include/asm/module-generic.h
diff --git a/include/asm-um/module-i386.h b/arch/um/include/asm/module-i386.h
index 5ead4a0b2e35..5ead4a0b2e35 100644
--- a/include/asm-um/module-i386.h
+++ b/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
index 35b5491d3e96..35b5491d3e96 100644
--- a/include/asm-um/module-x86_64.h
+++ b/arch/um/include/asm/module-x86_64.h
diff --git a/include/asm-um/msgbuf.h b/arch/um/include/asm/msgbuf.h
index 8ce8c30d5377..8ce8c30d5377 100644
--- a/include/asm-um/msgbuf.h
+++ b/arch/um/include/asm/msgbuf.h
diff --git a/include/asm-um/mtrr.h b/arch/um/include/asm/mtrr.h
index 5e9cd12c578d..5e9cd12c578d 100644
--- a/include/asm-um/mtrr.h
+++ b/arch/um/include/asm/mtrr.h
diff --git a/include/asm-um/mutex.h b/arch/um/include/asm/mutex.h
index 458c1f7fbc18..458c1f7fbc18 100644
--- a/include/asm-um/mutex.h
+++ b/arch/um/include/asm/mutex.h
diff --git a/include/asm-um/nops.h b/arch/um/include/asm/nops.h
index 814e9bf5dea6..814e9bf5dea6 100644
--- a/include/asm-um/nops.h
+++ b/arch/um/include/asm/nops.h
diff --git a/include/asm-um/page.h b/arch/um/include/asm/page.h
index a6df1f13d732..a6df1f13d732 100644
--- a/include/asm-um/page.h
+++ b/arch/um/include/asm/page.h
diff --git a/include/asm-um/page_offset.h b/arch/um/include/asm/page_offset.h
index 1c168dfbf359..1c168dfbf359 100644
--- a/include/asm-um/page_offset.h
+++ b/arch/um/include/asm/page_offset.h
diff --git a/include/asm-um/param.h b/arch/um/include/asm/param.h
index e44f4e60d16d..e44f4e60d16d 100644
--- a/include/asm-um/param.h
+++ b/arch/um/include/asm/param.h
diff --git a/include/asm-um/paravirt.h b/arch/um/include/asm/paravirt.h
index 9d6aaad80b5f..9d6aaad80b5f 100644
--- a/include/asm-um/paravirt.h
+++ b/arch/um/include/asm/paravirt.h
diff --git a/include/asm-um/pci.h b/arch/um/include/asm/pci.h
index 59923199cdc3..59923199cdc3 100644
--- a/include/asm-um/pci.h
+++ b/arch/um/include/asm/pci.h
diff --git a/include/asm-um/pda.h b/arch/um/include/asm/pda.h
index 0d8bf33ffd42..0d8bf33ffd42 100644
--- a/include/asm-um/pda.h
+++ b/arch/um/include/asm/pda.h
diff --git a/include/asm-um/percpu.h b/arch/um/include/asm/percpu.h
index 5723e2aab8e7..5723e2aab8e7 100644
--- a/include/asm-um/percpu.h
+++ b/arch/um/include/asm/percpu.h
diff --git a/include/asm-um/pgalloc.h b/arch/um/include/asm/pgalloc.h
index 9062a6e72241..9062a6e72241 100644
--- a/include/asm-um/pgalloc.h
+++ b/arch/um/include/asm/pgalloc.h
diff --git a/include/asm-um/pgtable-2level.h b/arch/um/include/asm/pgtable-2level.h
index f534b73e753e..f534b73e753e 100644
--- a/include/asm-um/pgtable-2level.h
+++ b/arch/um/include/asm/pgtable-2level.h
diff --git a/include/asm-um/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
index 0446f456b428..0446f456b428 100644
--- a/include/asm-um/pgtable-3level.h
+++ b/arch/um/include/asm/pgtable-3level.h
diff --git a/include/asm-um/pgtable.h b/arch/um/include/asm/pgtable.h
index 02db81b7b86e..02db81b7b86e 100644
--- a/include/asm-um/pgtable.h
+++ b/arch/um/include/asm/pgtable.h
diff --git a/include/asm-um/poll.h b/arch/um/include/asm/poll.h
index 1eb4e1bc6383..1eb4e1bc6383 100644
--- a/include/asm-um/poll.h
+++ b/arch/um/include/asm/poll.h
diff --git a/include/asm-um/posix_types.h b/arch/um/include/asm/posix_types.h
index 32fb4198f644..32fb4198f644 100644
--- a/include/asm-um/posix_types.h
+++ b/arch/um/include/asm/posix_types.h
diff --git a/include/asm-um/prctl.h b/arch/um/include/asm/prctl.h
index 64b6d099bdd5..64b6d099bdd5 100644
--- a/include/asm-um/prctl.h
+++ b/arch/um/include/asm/prctl.h
diff --git a/include/asm-um/processor-generic.h b/arch/um/include/asm/processor-generic.h
index bed668824b5f..bed668824b5f 100644
--- a/include/asm-um/processor-generic.h
+++ b/arch/um/include/asm/processor-generic.h
diff --git a/include/asm-um/processor-i386.h b/arch/um/include/asm/processor-i386.h
index a2b7fe13fe1e..a2b7fe13fe1e 100644
--- a/include/asm-um/processor-i386.h
+++ b/arch/um/include/asm/processor-i386.h
diff --git a/include/asm-um/processor-ppc.h b/arch/um/include/asm/processor-ppc.h
index 959323151229..959323151229 100644
--- a/include/asm-um/processor-ppc.h
+++ b/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
index e50933175e91..e50933175e91 100644
--- a/include/asm-um/processor-x86_64.h
+++ b/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
index 315749705ea1..315749705ea1 100644
--- a/include/asm-um/ptrace-generic.h
+++ b/arch/um/include/asm/ptrace-generic.h
diff --git a/include/asm-um/ptrace-i386.h b/arch/um/include/asm/ptrace-i386.h
index b2d24c5ea2c3..b2d24c5ea2c3 100644
--- a/include/asm-um/ptrace-i386.h
+++ b/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
index 4c475350dcf0..4c475350dcf0 100644
--- a/include/asm-um/ptrace-x86_64.h
+++ b/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
index dfb967b2d2f3..dfb967b2d2f3 100644
--- a/include/asm-um/required-features.h
+++ b/arch/um/include/asm/required-features.h
diff --git a/include/asm-um/resource.h b/arch/um/include/asm/resource.h
index c9b074001252..c9b074001252 100644
--- a/include/asm-um/resource.h
+++ b/arch/um/include/asm/resource.h
diff --git a/include/asm-um/rwlock.h b/arch/um/include/asm/rwlock.h
index ff383aafc9fe..ff383aafc9fe 100644
--- a/include/asm-um/rwlock.h
+++ b/arch/um/include/asm/rwlock.h
diff --git a/include/asm-um/rwsem.h b/arch/um/include/asm/rwsem.h
index b5fc449dc86b..b5fc449dc86b 100644
--- a/include/asm-um/rwsem.h
+++ b/arch/um/include/asm/rwsem.h
diff --git a/include/asm-um/scatterlist.h b/arch/um/include/asm/scatterlist.h
index e92016aa2079..e92016aa2079 100644
--- a/include/asm-um/scatterlist.h
+++ b/arch/um/include/asm/scatterlist.h
diff --git a/include/asm-um/sections.h b/arch/um/include/asm/sections.h
index 6b0231eefea8..6b0231eefea8 100644
--- a/include/asm-um/sections.h
+++ b/arch/um/include/asm/sections.h
diff --git a/include/asm-um/segment.h b/arch/um/include/asm/segment.h
index 45183fcd10b6..45183fcd10b6 100644
--- a/include/asm-um/segment.h
+++ b/arch/um/include/asm/segment.h
diff --git a/include/asm-um/sembuf.h b/arch/um/include/asm/sembuf.h
index 1ae82c14ff86..1ae82c14ff86 100644
--- a/include/asm-um/sembuf.h
+++ b/arch/um/include/asm/sembuf.h
diff --git a/include/asm-um/serial.h b/arch/um/include/asm/serial.h
index 61ad07cfd2d5..61ad07cfd2d5 100644
--- a/include/asm-um/serial.h
+++ b/arch/um/include/asm/serial.h
diff --git a/include/asm-um/setup.h b/arch/um/include/asm/setup.h
index 99f086301f4c..99f086301f4c 100644
--- a/include/asm-um/setup.h
+++ b/arch/um/include/asm/setup.h
diff --git a/include/asm-um/shmbuf.h b/arch/um/include/asm/shmbuf.h
index 9684d4a284a6..9684d4a284a6 100644
--- a/include/asm-um/shmbuf.h
+++ b/arch/um/include/asm/shmbuf.h
diff --git a/include/asm-um/shmparam.h b/arch/um/include/asm/shmparam.h
index 124c00174f6a..124c00174f6a 100644
--- a/include/asm-um/shmparam.h
+++ b/arch/um/include/asm/shmparam.h
diff --git a/include/asm-um/sigcontext-generic.h b/arch/um/include/asm/sigcontext-generic.h
index 164587014c61..164587014c61 100644
--- a/include/asm-um/sigcontext-generic.h
+++ b/arch/um/include/asm/sigcontext-generic.h
diff --git a/include/asm-um/sigcontext-i386.h b/arch/um/include/asm/sigcontext-i386.h
index b88333f488bb..b88333f488bb 100644
--- a/include/asm-um/sigcontext-i386.h
+++ b/arch/um/include/asm/sigcontext-i386.h
diff --git a/include/asm-um/sigcontext-ppc.h b/arch/um/include/asm/sigcontext-ppc.h
index 2467f20eda99..2467f20eda99 100644
--- a/include/asm-um/sigcontext-ppc.h
+++ b/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
index b600e0b01e48..b600e0b01e48 100644
--- a/include/asm-um/sigcontext-x86_64.h
+++ b/arch/um/include/asm/sigcontext-x86_64.h
diff --git a/include/asm-um/siginfo.h b/arch/um/include/asm/siginfo.h
index bec6124c36d0..bec6124c36d0 100644
--- a/include/asm-um/siginfo.h
+++ b/arch/um/include/asm/siginfo.h
diff --git a/include/asm-um/signal.h b/arch/um/include/asm/signal.h
index 52ed92cbce4c..52ed92cbce4c 100644
--- a/include/asm-um/signal.h
+++ b/arch/um/include/asm/signal.h
diff --git a/include/asm-um/smp.h b/arch/um/include/asm/smp.h
index f27a96313174..f27a96313174 100644
--- a/include/asm-um/smp.h
+++ b/arch/um/include/asm/smp.h
diff --git a/include/asm-um/socket.h b/arch/um/include/asm/socket.h
index 67886e42ef04..67886e42ef04 100644
--- a/include/asm-um/socket.h
+++ b/arch/um/include/asm/socket.h
diff --git a/include/asm-um/sockios.h b/arch/um/include/asm/sockios.h
index 93ee1c55c4d6..93ee1c55c4d6 100644
--- a/include/asm-um/sockios.h
+++ b/arch/um/include/asm/sockios.h
diff --git a/include/asm-um/spinlock.h b/arch/um/include/asm/spinlock.h
index f18c82886992..f18c82886992 100644
--- a/include/asm-um/spinlock.h
+++ b/arch/um/include/asm/spinlock.h
diff --git a/include/asm-um/spinlock_types.h b/arch/um/include/asm/spinlock_types.h
index e5a94294bf82..e5a94294bf82 100644
--- a/include/asm-um/spinlock_types.h
+++ b/arch/um/include/asm/spinlock_types.h
diff --git a/include/asm-um/stat.h b/arch/um/include/asm/stat.h
index 83ed85ad2539..83ed85ad2539 100644
--- a/include/asm-um/stat.h
+++ b/arch/um/include/asm/stat.h
diff --git a/include/asm-um/statfs.h b/arch/um/include/asm/statfs.h
index ba6fb53e7f87..ba6fb53e7f87 100644
--- a/include/asm-um/statfs.h
+++ b/arch/um/include/asm/statfs.h
diff --git a/include/asm-um/string.h b/arch/um/include/asm/string.h
index 9a0571f6dd61..9a0571f6dd61 100644
--- a/include/asm-um/string.h
+++ b/arch/um/include/asm/string.h
diff --git a/include/asm-um/suspend.h b/arch/um/include/asm/suspend.h
index f4e8e007f468..f4e8e007f468 100644
--- a/include/asm-um/suspend.h
+++ b/arch/um/include/asm/suspend.h
diff --git a/include/asm-um/system-generic.h b/arch/um/include/asm/system-generic.h
index 5bcfa35e7a22..5bcfa35e7a22 100644
--- a/include/asm-um/system-generic.h
+++ b/arch/um/include/asm/system-generic.h
diff --git a/include/asm-um/system-i386.h b/arch/um/include/asm/system-i386.h
index c436263e67ba..c436263e67ba 100644
--- a/include/asm-um/system-i386.h
+++ b/arch/um/include/asm/system-i386.h
diff --git a/include/asm-um/system-ppc.h b/arch/um/include/asm/system-ppc.h
index 17cde6640bf5..17cde6640bf5 100644
--- a/include/asm-um/system-ppc.h
+++ b/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
index e1b61b580734..e1b61b580734 100644
--- a/include/asm-um/system-x86_64.h
+++ b/arch/um/include/asm/system-x86_64.h
diff --git a/include/asm-um/termbits.h b/arch/um/include/asm/termbits.h
index 5739c608a2cb..5739c608a2cb 100644
--- a/include/asm-um/termbits.h
+++ b/arch/um/include/asm/termbits.h
diff --git a/include/asm-um/termios.h b/arch/um/include/asm/termios.h
index d9f97b303311..d9f97b303311 100644
--- a/include/asm-um/termios.h
+++ b/arch/um/include/asm/termios.h
diff --git a/include/asm-um/thread_info.h b/arch/um/include/asm/thread_info.h
index 62274ab9471f..62274ab9471f 100644
--- a/include/asm-um/thread_info.h
+++ b/arch/um/include/asm/thread_info.h
diff --git a/include/asm-um/timex.h b/arch/um/include/asm/timex.h
index 0f4ada08f748..0f4ada08f748 100644
--- a/include/asm-um/timex.h
+++ b/arch/um/include/asm/timex.h
diff --git a/include/asm-um/tlb.h b/arch/um/include/asm/tlb.h
index 5240fa1c5e08..5240fa1c5e08 100644
--- a/include/asm-um/tlb.h
+++ b/arch/um/include/asm/tlb.h
diff --git a/include/asm-um/tlbflush.h b/arch/um/include/asm/tlbflush.h
index 614f2c091178..614f2c091178 100644
--- a/include/asm-um/tlbflush.h
+++ b/arch/um/include/asm/tlbflush.h
diff --git a/include/asm-um/topology.h b/arch/um/include/asm/topology.h
index 0905e4f21d42..0905e4f21d42 100644
--- a/include/asm-um/topology.h
+++ b/arch/um/include/asm/topology.h
diff --git a/include/asm-um/types.h b/arch/um/include/asm/types.h
index 816e9590fc73..816e9590fc73 100644
--- a/include/asm-um/types.h
+++ b/arch/um/include/asm/types.h
diff --git a/include/asm-um/uaccess.h b/arch/um/include/asm/uaccess.h
index b9a895d6fa1d..b9a895d6fa1d 100644
--- a/include/asm-um/uaccess.h
+++ b/arch/um/include/asm/uaccess.h
diff --git a/include/asm-um/ucontext.h b/arch/um/include/asm/ucontext.h
index 5c96c0e607f0..5c96c0e607f0 100644
--- a/include/asm-um/ucontext.h
+++ b/arch/um/include/asm/ucontext.h
diff --git a/include/asm-um/unaligned.h b/arch/um/include/asm/unaligned.h
index a47196974e39..a47196974e39 100644
--- a/include/asm-um/unaligned.h
+++ b/arch/um/include/asm/unaligned.h
diff --git a/include/asm-um/unistd.h b/arch/um/include/asm/unistd.h
index 38bd9d94ee46..38bd9d94ee46 100644
--- a/include/asm-um/unistd.h
+++ b/arch/um/include/asm/unistd.h
diff --git a/include/asm-um/user.h b/arch/um/include/asm/user.h
index aae414ee1f5e..aae414ee1f5e 100644
--- a/include/asm-um/user.h
+++ b/arch/um/include/asm/user.h
diff --git a/include/asm-um/vga.h b/arch/um/include/asm/vga.h
index 903a592b00d0..903a592b00d0 100644
--- a/include/asm-um/vga.h
+++ b/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
index e0d24c568dbc..e0d24c568dbc 100644
--- a/include/asm-um/vm-flags-i386.h
+++ b/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
index 3213edfa7888..3213edfa7888 100644
--- a/include/asm-um/vm-flags-x86_64.h
+++ b/arch/um/include/asm/vm-flags-x86_64.h
diff --git a/include/asm-um/vm86.h b/arch/um/include/asm/vm86.h
index 7801f82de1f4..7801f82de1f4 100644
--- a/include/asm-um/vm86.h
+++ b/arch/um/include/asm/vm86.h
diff --git a/include/asm-um/xor.h b/arch/um/include/asm/xor.h
index a19db3e17241..a19db3e17241 100644
--- a/include/asm-um/xor.h
+++ b/arch/um/include/asm/xor.h