Commit b4297b01 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://

* 'merge' of git://
  powerpc: Fix DEBUG_HIGHMEM build break from d4515646
parents a8a84540 e8105903
......@@ -29,5 +29,16 @@ enum km_type {
* 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.
#define KM_NMI (-1)
#define KM_NMI_PTE (-1)
#define KM_IRQ_PTE (-1)
#endif /* __KERNEL__ */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment