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 d451564669
This commit is contained in:
commit
b4297b0119
|
@ -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 */
|
||||
|
|
Loading…
Reference in a new issue