diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-16 16:03:31 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 04:38:14 -0400 |
commit | 41c094fd3ca54f1a71233049cf136ff94c91f4ae (patch) | |
tree | 9ce8de894276e69d30c893700a9b70fb4e176511 /arch/x86/kernel/e820_64.c | |
parent | 8c5beb50d3ec915d15c4d38aa37282309a65f14e (diff) |
x86: move e820_resource_resources to e820.c
and make 32-bit resource registration more like 64 bit.
also move probe_roms back to setup_32.c
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/e820_64.c')
-rw-r--r-- | arch/x86/kernel/e820_64.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/arch/x86/kernel/e820_64.c b/arch/x86/kernel/e820_64.c index 47952b1690b6..cb03bff9fa2f 100644 --- a/arch/x86/kernel/e820_64.c +++ b/arch/x86/kernel/e820_64.c | |||
@@ -41,30 +41,6 @@ unsigned long end_pfn; | |||
41 | */ | 41 | */ |
42 | unsigned long max_pfn_mapped; | 42 | unsigned long max_pfn_mapped; |
43 | 43 | ||
44 | /* | ||
45 | * Mark e820 reserved areas as busy for the resource manager. | ||
46 | */ | ||
47 | void __init e820_reserve_resources(void) | ||
48 | { | ||
49 | int i; | ||
50 | struct resource *res; | ||
51 | |||
52 | res = alloc_bootmem_low(sizeof(struct resource) * e820.nr_map); | ||
53 | for (i = 0; i < e820.nr_map; i++) { | ||
54 | switch (e820.map[i].type) { | ||
55 | case E820_RAM: res->name = "System RAM"; break; | ||
56 | case E820_ACPI: res->name = "ACPI Tables"; break; | ||
57 | case E820_NVS: res->name = "ACPI Non-volatile Storage"; break; | ||
58 | default: res->name = "reserved"; | ||
59 | } | ||
60 | res->start = e820.map[i].addr; | ||
61 | res->end = res->start + e820.map[i].size - 1; | ||
62 | res->flags = IORESOURCE_MEM | IORESOURCE_BUSY; | ||
63 | insert_resource(&iomem_resource, res); | ||
64 | res++; | ||
65 | } | ||
66 | } | ||
67 | |||
68 | static void early_panic(char *msg) | 44 | static void early_panic(char *msg) |
69 | { | 45 | { |
70 | early_printk(msg); | 46 | early_printk(msg); |