From 5ead77558d36f148e234d8f403922d6d904ba292 Mon Sep 17 00:00:00 2001 From: Becky Bruce Date: Mon, 23 Nov 2009 12:28:53 +0000 Subject: [PATCH] --- yaml --- r: 175799 b: refs/heads/master c: 2d7cf3ef879b22bdfd271aa3b66733c53279e813 h: refs/heads/master i: 175797: c5473681b5f9160461151b34768c76ebb4c251bb 175795: 277b0af807abf69d592b6f682dc3b7af47a1447c 175791: a0b48bece3b94b6c0b31bd56161a37480cfea463 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/kmap_types.h | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2dcdf0c7272f..c288ba9a14db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c31629fd60037c5eb2b8fd0e6def9fe097fa28e +refs/heads/master: 2d7cf3ef879b22bdfd271aa3b66733c53279e813 diff --git a/trunk/arch/powerpc/include/asm/kmap_types.h b/trunk/arch/powerpc/include/asm/kmap_types.h index b6bac6f61c16..916369575c97 100644 --- a/trunk/arch/powerpc/include/asm/kmap_types.h +++ b/trunk/arch/powerpc/include/asm/kmap_types.h @@ -29,5 +29,16 @@ enum km_type { KM_TYPE_NR }; +/* + * This is a temporary build fix that (so they say on lkml....) should no longer + * be required after 2.6.33, because of changes planned to the kmap code. + * Let's try to remove this cruft then. + */ +#ifdef CONFIG_DEBUG_HIGHMEM +#define KM_NMI (-1) +#define KM_NMI_PTE (-1) +#define KM_IRQ_PTE (-1) +#endif + #endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_KMAP_TYPES_H */