]>
Commit | Line | Data |
---|---|---|
c2cde1ea GKH |
1 | From ff30a0543e9a6cd732582063e7cae951cdb7acf2 Mon Sep 17 00:00:00 2001 |
2 | From: Jan Beulich <JBeulich@novell.com> | |
3 | Date: Mon, 15 Mar 2010 10:11:15 +0000 | |
4 | Subject: x86: Fix placement of FIX_OHCI1394_BASE | |
5 | ||
6 | From: Jan Beulich <JBeulich@novell.com> | |
7 | ||
8 | commit ff30a0543e9a6cd732582063e7cae951cdb7acf2 upstream. | |
9 | ||
10 | Ever for 32-bit with sufficiently high NR_CPUS, and starting | |
11 | with commit 789d03f584484af85dbdc64935270c8e45f36ef7 also for | |
12 | 64-bit, the statically allocated early fixmap page tables were | |
13 | not covering FIX_OHCI1394_BASE, leading to a boot time crash | |
14 | when "ohci1394_dma=early" was used. Despite this entry not being | |
15 | a permanently used one, it needs to be moved into the permanent | |
16 | range since it has to be close to FIX_DBGP_BASE and | |
17 | FIX_EARLYCON_MEM_BASE. | |
18 | ||
19 | Reported-bisected-and-tested-by: Justin P. Mattock <justinmattock@gmail.com> | |
20 | Fixes-bug: http://bugzilla.kernel.org/show_bug.cgi?id=14487 | |
21 | Signed-off-by: Jan Beulich <jbeulich@novell.com> | |
22 | LKML-Reference: <4B9E15D30200007800034D23@vpn.id2.novell.com> | |
23 | Signed-off-by: Ingo Molnar <mingo@elte.hu> | |
24 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
25 | ||
26 | --- | |
27 | arch/x86/include/asm/fixmap.h | 6 +++--- | |
28 | 1 file changed, 3 insertions(+), 3 deletions(-) | |
29 | ||
30 | --- a/arch/x86/include/asm/fixmap.h | |
31 | +++ b/arch/x86/include/asm/fixmap.h | |
32 | @@ -82,6 +82,9 @@ enum fixed_addresses { | |
33 | #endif | |
34 | FIX_DBGP_BASE, | |
35 | FIX_EARLYCON_MEM_BASE, | |
36 | +#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT | |
37 | + FIX_OHCI1394_BASE, | |
38 | +#endif | |
39 | #ifdef CONFIG_X86_LOCAL_APIC | |
40 | FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */ | |
41 | #endif | |
42 | @@ -126,9 +129,6 @@ enum fixed_addresses { | |
43 | FIX_BTMAP_END = __end_of_permanent_fixed_addresses + 256 - | |
44 | (__end_of_permanent_fixed_addresses & 255), | |
45 | FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_SLOTS - 1, | |
46 | -#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT | |
47 | - FIX_OHCI1394_BASE, | |
48 | -#endif | |
49 | #ifdef CONFIG_X86_32 | |
50 | FIX_WP_TEST, | |
51 | #endif |