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

[AmÃrico Wang]

On Thu, Nov 27, 2008 at 6:12 PM, AmÃrico Wang <xiyou.wangcong@xxxxxxxxx> 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 (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.)


Signed-off-by: WANG Cong <wangcong@xxxxxxxxx>
Cc: Jeff Dike <jdike@xxxxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>

diff --git a/arch/um/include/asm/fixmap.h b/arch/um/include/asm/fixmap.h
index 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.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>
¢éì®&Þ~º&¶¬–+-±éÝ¥Šw®žË±Êâmébžìdz¹Þ)í…æèw*jg¬±¨¶‰šŽŠÝj/êäz¹ÞŠà2ŠÞ¨è­Ú&¢)ß«a¶Úþø®G«éh®æj:+v‰¨Šwè†Ù>Wš±êÞiÛaxPjØm¶ŸÿÃ-»+ƒùdš_