x86: Fix placement of FIX_OHCI1394_BASE
in [Kernel]
|
Prev: [PATCH 3/5] usb-console: pass baud from console to the initial tty open
Next: drivers/net/wimax/i2400m/fw.c fix possible double free
From: Justin Mattock on 16 Mar 2010 17:10 On Tue, Mar 16, 2010 at 7:48 AM, tip-bot for Jan Beulich <JBeulich(a)novell.com> wrote: > Commit-ID: �ff30a0543e9a6cd732582063e7cae951cdb7acf2 > Gitweb: � � http://git.kernel.org/tip/ff30a0543e9a6cd732582063e7cae951cdb7acf2 > Author: � � Jan Beulich <JBeulich(a)novell.com> > AuthorDate: Mon, 15 Mar 2010 10:11:15 +0000 > Committer: �Ingo Molnar <mingo(a)elte.hu> > CommitDate: Tue, 16 Mar 2010 11:16:27 +0100 > > x86: Fix placement of FIX_OHCI1394_BASE > > Ever for 32-bit with sufficiently high NR_CPUS, and starting > with commit 789d03f584484af85dbdc64935270c8e45f36ef7 also for > 64-bit, the statically allocated early fixmap page tables were > not covering FIX_OHCI1394_BASE, leading to a boot time crash > when "ohci1394_dma=early" was used. Despite this entry not being > a permanently used one, it needs to be moved into the permanent > range since it has to be close to FIX_DBGP_BASE and > FIX_EARLYCON_MEM_BASE. > > Reported-bisected-and-tested-by: Justin P. Mattock <justinmattock(a)gmail.com> > Fixes-bug: http://bugzilla.kernel.org/show_bug.cgi?id=14487 > Signed-off-by: Jan Beulich <jbeulich(a)novell.com> > Cc: <stable(a)kernel.org> # [as far back as long as it still applies] > LKML-Reference: <4B9E15D30200007800034D23(a)vpn.id2.novell.com> > Signed-off-by: Ingo Molnar <mingo(a)elte.hu> > --- > �arch/x86/include/asm/fixmap.h | � �6 +++--- > �1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h > index 635f03b..d07b44f 100644 > --- a/arch/x86/include/asm/fixmap.h > +++ b/arch/x86/include/asm/fixmap.h > @@ -82,6 +82,9 @@ enum fixed_addresses { > �#endif > � � � �FIX_DBGP_BASE, > � � � �FIX_EARLYCON_MEM_BASE, > +#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT > + � � � FIX_OHCI1394_BASE, > +#endif > �#ifdef CONFIG_X86_LOCAL_APIC > � � � �FIX_APIC_BASE, �/* local (CPU) APIC) -- required for SMP or not */ > �#endif > @@ -132,9 +135,6 @@ enum fixed_addresses { > � � � � � (__end_of_permanent_fixed_addresses & (TOTAL_FIX_BTMAPS - 1)) > � � � � : __end_of_permanent_fixed_addresses, > � � � �FIX_BTMAP_BEGIN = FIX_BTMAP_END + TOTAL_FIX_BTMAPS - 1, > -#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT > - � � � FIX_OHCI1394_BASE, > -#endif > �#ifdef CONFIG_X86_32 > � � � �FIX_WP_TEST, > �#endif > looks good over here.. -- Justin P. Mattock -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |