From e21ced964b9043639576d6dd6cd60cac9e363f4c Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 18 Aug 2008 10:20:37 -0400
Subject: [PATCH] --- yaml --- r: 117432 b: refs/heads/master c:
 2985cfdb04002b8e4c003a4008b2580aaebf75fc h: refs/heads/master v: v3

---
 [refs]                                                         | 2 +-
 trunk/arch/um/Makefile                                         | 3 +--
 trunk/arch/um/include/asm/page.h                               | 2 +-
 .../{asm/vm-flags-i386.h => shared/sysdep-i386/vm-flags.h}     | 0
 .../{asm/vm-flags-x86_64.h => shared/sysdep-x86_64/vm-flags.h} | 0
 5 files changed, 3 insertions(+), 4 deletions(-)
 rename trunk/arch/um/include/{asm/vm-flags-i386.h => shared/sysdep-i386/vm-flags.h} (100%)
 rename trunk/arch/um/include/{asm/vm-flags-x86_64.h => shared/sysdep-x86_64/vm-flags.h} (100%)

diff --git a/[refs] b/[refs]
index 36c9104d3a4e..7e5247440a0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b0eed4ef3d024c3a709fbc3bb45ee5b0ac8486d
+refs/heads/master: 2985cfdb04002b8e4c003a4008b2580aaebf75fc
diff --git a/trunk/arch/um/Makefile b/trunk/arch/um/Makefile
index fac25e202120..3af8c81bf4f0 100644
--- a/trunk/arch/um/Makefile
+++ b/trunk/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/trunk/arch/um/include/asm/page.h b/trunk/arch/um/include/asm/page.h
index a6df1f13d732..55f28a0bae6d 100644
--- a/trunk/arch/um/include/asm/page.h
+++ b/trunk/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/trunk/arch/um/include/asm/vm-flags-i386.h b/trunk/arch/um/include/shared/sysdep-i386/vm-flags.h
similarity index 100%
rename from trunk/arch/um/include/asm/vm-flags-i386.h
rename to trunk/arch/um/include/shared/sysdep-i386/vm-flags.h
diff --git a/trunk/arch/um/include/asm/vm-flags-x86_64.h b/trunk/arch/um/include/shared/sysdep-x86_64/vm-flags.h
similarity index 100%
rename from trunk/arch/um/include/asm/vm-flags-x86_64.h
rename to trunk/arch/um/include/shared/sysdep-x86_64/vm-flags.h