---

yaml --- r: 117432 b: refs/heads/master c: 2985cfd h: refs/heads/master v: v3
git-mirror · Oct 23, 2008 · e21ced9 · e21ced9
1 parent 1522373
commit e21ced9
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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 → .../um/include/shared/sysdep-i386/vm-flags.h b/trunk/arch/um/include/asm/vm-flags-i386.h → .../um/include/shared/sysdep-i386/vm-flags.h
diff --git a/trunk/arch/um/include/asm/vm-flags-x86_64.h → ...m/include/shared/sysdep-x86_64/vm-flags.h b/trunk/arch/um/include/asm/vm-flags-x86_64.h → ...m/include/shared/sysdep-x86_64/vm-flags.h