Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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 d4515646
parents a8a84540 e8105903

arch/powerpc/include/asm/kmap_types.h

+11 −0
Original line number Diff line number Diff line
@@ -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 */