Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 789d03f5 authored by Jan Beulich's avatar Jan Beulich Committed by Ingo Molnar
Browse files

x86: Fix fixmap ordering 



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: default avatarJan Beulich <jbeulich@novell.com>
Cc: <stable@kernel.org> # for 2.6.30.x
LKML-Reference: <4A4A0A8702000078000082E8@vpn.id2.novell.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 9e314996

arch/x86/include/asm/fixmap.h

+3 −3
Original line number Diff line number Diff line
@@ -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