Skip to contentSkip to conversation

i386 linux: adjust kexec reservation

PATCH Applied Jan Beulich 2 participants 2 messages Apr 6, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 i386 linux: adjust kexec reservation

Comparing arch/i386/kernel/setup{,-xen}.c, it seems like the place reserve_bootmem() is currently called in the Xen kernel is the result of a mis-merge. Jan

arch/i386/kernel/setup-xen.c +5 -5
Index: head-2006-04-05/arch/i386/kernel/setup-xen.c
===================================================================
@@ -1317,6 +1317,11 @@ void __init setup_bootmem_allocator(void
 		}
 	}
 #endif
+#ifdef CONFIG_KEXEC
+	if (crashk_res.start != crashk_res.end)
+		reserve_bootmem(crashk_res.start,
+			crashk_res.end - crashk_res.start + 1);
+#endif
 
 	if (!xen_feature(XENFEAT_auto_translated_physmap))
 		phys_to_machine_mapping =
@@ -1436,11 +1441,6 @@ legacy_init_iomem_resources(struct resou
 		}
 	}
 #endif
-#ifdef CONFIG_KEXEC
-	if (crashk_res.start != crashk_res.end)
-		reserve_bootmem(crashk_res.start,
-			crashk_res.end - crashk_res.start + 1);
-#endif
 }
 
 /*

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

Applied
#1 lore raw
Quoted 2 lines · Jan Beulich

Comparing arch/i386/kernel/setup{,-xen}.c, it seems like the place reserve_bootmem() is currently called in the Xen kernel is the result of a mis-merge. Jan

Applied, thanks.

-- Keir