[Patch] uml: fix the highmem build error

[Patch] uml: fix the highmem build error

[Américo Wang]

This patch fixes this error:

arch/um/kernel/mem.c: In function ‘init_highmem’:        
arch/um/kernel/mem.c:177: error: ‘pkmap_page_table’ undeclared (first
use in this function)                                 
arch/um/kernel/mem.c:177: error: (Each undeclared identifier is
reported only once      
arch/um/kernel/mem.c:177: error: for each function it appears in.)  

Compile and run tested.

Signed-off-by: WANG Cong <wangcong@zeuux.org>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>

---
diff --git a/arch/um/include/asm/fixmap.h b/arch/um/include/asm/fixmap.h
index 69c0252..4e656c9 100644
--- a/arch/um/include/asm/fixmap.h
+++ b/arch/um/include/asm/fixmap.h
@@ -40,6 +40,9 @@ enum fixed_addresses {
 #endif
 	__end_of_fixed_addresses
 };
+extern pte_t *pkmap_page_table;
+extern pte_t *kmap_pte;
+extern pgprot_t kmap_prot;
 
 extern void __set_fixmap (enum fixed_addresses idx,
 			  unsigned long phys, pgprot_t flags);
diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
index bcc079c..884f9e2 100644
--- a/arch/x86/mm/highmem_32.c
+++ b/arch/x86/mm/highmem_32.c
@@ -1,3 +1,4 @@
+#include <asm/fixmap.h>
 #include <linux/highmem.h>
 #include <linux/module.h>
 

Re: [Patch] uml: fix the highmem build error

[Américo Wang]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 1785 bytes --]

On Thu, Nov 27, 2008 at 6:12 PM, Américo Wang <xiyou.wangcong@gmail.com> wrote:>> This patch fixes this error:>> arch/um/kernel/mem.c: In function 'init_highmem':> arch/um/kernel/mem.c:177: error: 'pkmap_page_table' undeclared (first> use in this function)> arch/um/kernel/mem.c:177: error: (Each undeclared identifier is> reported only once> arch/um/kernel/mem.c:177: error: for each function it appears in.)>> Compile and run tested.>
Ignore the above one, below is the updated version.
------->
This patch fixes this error:
arch/um/kernel/mem.c: In function 'init_highmem':arch/um/kernel/mem.c:177: error: 'pkmap_page_table' undeclared (firstuse in this function)arch/um/kernel/mem.c:177: error: (Each undeclared identifier isreported only oncearch/um/kernel/mem.c:177: error: for each function it appears in.)

Signed-off-by: WANG Cong <wangcong@zeuux.org>Cc: Jeff Dike <jdike@addtoit.com>Cc: Al Viro <viro@zeniv.linux.org.uk>
diff --git a/arch/um/include/asm/fixmap.h b/arch/um/include/asm/fixmap.hindex 69c0252..a8e29e5 100644--- a/arch/um/include/asm/fixmap.h+++ b/arch/um/include/asm/fixmap.h@@ -41,6 +41,12 @@ enum fixed_addresses { 	__end_of_fixed_addresses };
+#ifdef CONFIG_HIGHMEM+extern pte_t *pkmap_page_table;+extern pte_t *kmap_pte;+extern pgprot_t kmap_prot;+#endif+ extern void __set_fixmap (enum fixed_addresses idx, 			  unsigned long phys, pgprot_t flags);
diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.cindex bcc079c..884f9e2 100644--- a/arch/x86/mm/highmem_32.c+++ b/arch/x86/mm/highmem_32.c@@ -1,3 +1,4 @@+#include <asm/fixmap.h> #include <linux/highmem.h> #include <linux/module.h>ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥