On Fri, 01 Nov, at 11:35:08AM, Dave Young wrote: > > The conflict is caused by missing one commit in matt's efi next tree: > > > > commit 700870119f49084da004ab588ea2b799689efaf7 > > Author: Josh Boyer <jwboyer@xxxxxxxxxx> > > Date: Thu Apr 18 07:51:34 2013 -0700 > > > > x86, efi: Don't map Boot Services on i386 > > > > Add patch to fix 32bit EFI service mapping (rhbz 726701) > > > > Multiple people are reporting hitting the following WARNING on i386, > > > > WARNING: at arch/x86/mm/ioremap.c:102 __ioremap_caller+0x3d3/0x440() > > Modules linked in: > > Pid: 0, comm: swapper Not tainted 3.9.0-rc7+ #95 > > Rethinking about above commit, it is actually a workaround for > mapping boot service, I suspect the problem connect to the off-by-one > problem in boot service reserve function. Matt, idea? No, it's not the same problem. And just to make absolutely sure I reverted the above commit and applied your patch, but I still see the WARN_ON() described above. -- Matt Fleming, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html