diff options
Diffstat (limited to 'arch/x86/include/asm/fixmap.h')
| -rw-r--r-- | arch/x86/include/asm/fixmap.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h index 2d81af3974a0..7b2d71df39a6 100644 --- a/arch/x86/include/asm/fixmap.h +++ b/arch/x86/include/asm/fixmap.h | |||
| @@ -111,12 +111,9 @@ enum fixed_addresses { | |||
| 111 | #ifdef CONFIG_PARAVIRT | 111 | #ifdef CONFIG_PARAVIRT |
| 112 | FIX_PARAVIRT_BOOTMAP, | 112 | FIX_PARAVIRT_BOOTMAP, |
| 113 | #endif | 113 | #endif |
| 114 | FIX_TEXT_POKE0, /* reserve 2 pages for text_poke() */ | 114 | FIX_TEXT_POKE1, /* reserve 2 pages for text_poke() */ |
| 115 | FIX_TEXT_POKE1, | 115 | FIX_TEXT_POKE0, /* first page is last, because allocation is backward */ |
| 116 | __end_of_permanent_fixed_addresses, | 116 | __end_of_permanent_fixed_addresses, |
| 117 | #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT | ||
| 118 | FIX_OHCI1394_BASE, | ||
| 119 | #endif | ||
| 120 | /* | 117 | /* |
| 121 | * 256 temporary boot-time mappings, used by early_ioremap(), | 118 | * 256 temporary boot-time mappings, used by early_ioremap(), |
| 122 | * before ioremap() is functional. | 119 | * before ioremap() is functional. |
| @@ -129,6 +126,9 @@ enum fixed_addresses { | |||
| 129 | FIX_BTMAP_END = __end_of_permanent_fixed_addresses + 256 - | 126 | FIX_BTMAP_END = __end_of_permanent_fixed_addresses + 256 - |
| 130 | (__end_of_permanent_fixed_addresses & 255), | 127 | (__end_of_permanent_fixed_addresses & 255), |
| 131 | FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_SLOTS - 1, | 128 | FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_SLOTS - 1, |
| 129 | #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT | ||
| 130 | FIX_OHCI1394_BASE, | ||
| 131 | #endif | ||
| 132 | #ifdef CONFIG_X86_32 | 132 | #ifdef CONFIG_X86_32 |
| 133 | FIX_WP_TEST, | 133 | FIX_WP_TEST, |
| 134 | #endif | 134 | #endif |
