| From 789d03f584484af85dbdc64935270c8e45f36ef7 Mon Sep 17 00:00:00 2001 |
| From: Jan Beulich <JBeulich@novell.com> |
| Date: Tue, 30 Jun 2009 11:52:23 +0100 |
| Subject: x86: Fix fixmap ordering |
| |
| From: Jan Beulich <JBeulich@novell.com> |
| |
| commit 789d03f584484af85dbdc64935270c8e45f36ef7 upstream. |
| |
| The merge of the 32- and 64-bit fixmap headers made a latent |
| bug on x86-64 a real one: with the right config settings |
| it is possible for FIX_OHCI1394_BASE to overlap the FIX_BTMAP_* |
| range. |
| |
| Signed-off-by: Jan Beulich <jbeulich@novell.com> |
| LKML-Reference: <4A4A0A8702000078000082E8@vpn.id2.novell.com> |
| Signed-off-by: Ingo Molnar <mingo@elte.hu> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| arch/x86/include/asm/fixmap.h | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/arch/x86/include/asm/fixmap.h |
| +++ b/arch/x86/include/asm/fixmap.h |
| @@ -114,9 +114,6 @@ enum fixed_addresses { |
| FIX_TEXT_POKE0, /* reserve 2 pages for text_poke() */ |
| FIX_TEXT_POKE1, |
| __end_of_permanent_fixed_addresses, |
| -#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT |
| - FIX_OHCI1394_BASE, |
| -#endif |
| /* |
| * 256 temporary boot-time mappings, used by early_ioremap(), |
| * before ioremap() is functional. |
| @@ -129,6 +126,9 @@ enum fixed_addresses { |
| FIX_BTMAP_END = __end_of_permanent_fixed_addresses + 256 - |
| (__end_of_permanent_fixed_addresses & 255), |
| FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_SLOTS - 1, |
| +#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT |
| + FIX_OHCI1394_BASE, |
| +#endif |
| #ifdef CONFIG_X86_32 |
| FIX_WP_TEST, |
| #endif |
