On Sat, Mar 14, 2009 at 02:15:55PM +0100, Ingo Molnar wrote: > > The patches are now sitting in -mmotm now. For -tip, here are the rebased > > patches for the debug_kmap_atomic_prot() check. > > Due to the other-arch changes it's better to keep them in -mm i > guess. Once the current batch goes out to linux-next (in the > next few days) Andrew could pick up the two -tip patches you > posted here. OK, then please consider to apply this patch for now. From: Akinobu Mita <akinobu.mita@xxxxxxxxx> Subject: remove unnecessary include in iomap_32.c asm/highmem.h inclusion is added to use kmap_atomic_prot_pfn() by commit bb6d59ca927d855ffac567b35c0a790c67016103 Now kmap_atomic_prot_pfn is moved to iomap_32.c by commit dd63fdcc63f0f853b116b52e56200a0e0227cf5f So the asm/highmem.h inclusion in iomap_32.c is unnecessary now. Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx> --- arch/x86/mm/iomap_32.c | 1 - 1 file changed, 1 deletion(-) Index: linux.tree.git/arch/x86/mm/iomap_32.c =================================================================== --- linux.tree.git.orig/arch/x86/mm/iomap_32.c +++ linux.tree.git/arch/x86/mm/iomap_32.c @@ -18,7 +18,6 @@ #include <asm/iomap.h> #include <asm/pat.h> -#include <asm/highmem.h> #include <linux/module.h> int is_io_mapping_possible(resource_size_t base, unsigned long size) -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|