diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 23:49:39 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 23:49:39 +0100 |
| commit | b4297b01198bc2501038bb463b6631f6f3782cc0 (patch) | |
| tree | 2d4db2c7d7430347bbe1a17e53acb7d376bfd4c3 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 (diff) | |
| parent | powerpc: Fix DEBUG_HIGHMEM build break from d4515646699 (diff) | |
| download | linux-b4297b01198bc2501038bb463b6631f6f3782cc0.tar.xz linux-b4297b01198bc2501038bb463b6631f6f3782cc0.zip | |
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.h | 11 |
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 b6bac6f61c16..916369575c97 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 */ |