4 files changed, 2 insertions, 3 deletions

diff --git a/arch/um/Makefile b/arch/um/Makefile
index fac25e202120..3af8c81bf4f0 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -19,8 +19,7 @@ core-y			+= $(ARCH_DIR)/kernel/		\
                            $(ARCH_DIR)/os-$(OS)/
 
 # Have to precede the include because the included Makefiles reference them.
-SYMLINK_HEADERS := archparam.h processor.h ptrace.h \
-        module.h vm-flags.h elf.h
+SYMLINK_HEADERS := archparam.h processor.h ptrace.h module.h elf.h
 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
diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
index a6df1f13d732..55f28a0bae6d 100644
--- a/arch/um/include/asm/page.h
+++ b/arch/um/include/asm/page.h
@@ -19,7 +19,7 @@
 struct page;
 
 #include <linux/types.h>
-#include <asm/vm-flags.h>
+#include <sysdep/vm-flags.h>
 
 /*
  * These are used to make use of C type-checking..
diff --git a/arch/um/include/asm/vm-flags-i386.h b/arch/um/include/shared/sysdep-i386/vm-flags.h
index e0d24c568dbc..e0d24c568dbc 100644
--- a/arch/um/include/asm/vm-flags-i386.h
+++ b/arch/um/include/shared/sysdep-i386/vm-flags.h
diff --git a/arch/um/include/asm/vm-flags-x86_64.h b/arch/um/include/shared/sysdep-x86_64/vm-flags.h
index 3213edfa7888..3213edfa7888 100644
--- a/arch/um/include/asm/vm-flags-x86_64.h
+++ b/arch/um/include/shared/sysdep-x86_64/vm-flags.h