lkml.org 
[lkml]   [2009]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] x86: fix fixmap ordering
The merge of the 32- and 64-bit fixmap headers made a latent bug on
x86-64 a real one ix86: With the right config settings it is possible
for FIX_OHCI1394_BASE to overlap the FIX_BTMAP_* range.

Likely also a 2.6.30.x candidate.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

---
arch/x86/include/asm/fixmap.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- linux-2.6.31-rc1/arch/x86/include/asm/fixmap.h 2009-06-10 05:05:27.000000000 +0200
+++ 2.6.31-rc1-x86-fixmap/arch/x86/include/asm/fixmap.h 2009-06-24 15:12:43.000000000 +0200
@@ -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




\
 
 \ /
  Last update: 2009-06-30 12:55    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site