summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-30 14:49:39 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-30 14:49:39 -0800
commitb4297b01198bc2501038bb463b6631f6f3782cc0 (patch)
tree2d4db2c7d7430347bbe1a17e53acb7d376bfd4c3
parenta8a84540eb3fd0493f250dc1c513bef6810a50fd (diff)
parente8105903d78c81119754a42926951d9d17e191ba (diff)
downloadop-kernel-dev-b4297b01198bc2501038bb463b6631f6f3782cc0.zip
op-kernel-dev-b4297b01198bc2501038bb463b6631f6f3782cc0.tar.gz
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Fix DEBUG_HIGHMEM build break from d4515646699
-rw-r--r--arch/powerpc/include/asm/kmap_types.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
index b6bac6f..9163695 100644
--- a/arch/powerpc/include/asm/kmap_types.h
+++ b/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 */
OpenPOWER on IntegriCloud