git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86/amd-nb' into x86/apic-cleanups
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
setup.c
diff --git
a/arch/x86/kernel/setup.c
b/arch/x86/kernel/setup.c
index
95a3274
..
0afb8c7
100644
(file)
--- a/
arch/x86/kernel/setup.c
+++ b/
arch/x86/kernel/setup.c
@@
-694,7
+694,7
@@
static u64 __init get_max_mapped(void)
void __init setup_arch(char **cmdline_p)
{
int acpi = 0;
void __init setup_arch(char **cmdline_p)
{
int acpi = 0;
- int
k8
= 0;
+ int
amd
= 0;
unsigned long flags;
#ifdef CONFIG_X86_32
unsigned long flags;
#ifdef CONFIG_X86_32
@@
-769,6
+769,8
@@
void __init setup_arch(char **cmdline_p)
x86_init.oem.arch_setup();
x86_init.oem.arch_setup();
+ resource_alloc_from_bottom = 0;
+ iomem_resource.end = (1ULL << boot_cpu_data.x86_phys_bits) - 1;
setup_memory_map();
parse_setup_data();
/* update the e820_saved too */
setup_memory_map();
parse_setup_data();
/* update the e820_saved too */
@@
-979,12
+981,12
@@
void __init setup_arch(char **cmdline_p)
acpi = acpi_numa_init();
#endif
acpi = acpi_numa_init();
#endif
-#ifdef CONFIG_
K8
_NUMA
+#ifdef CONFIG_
AMD
_NUMA
if (!acpi)
if (!acpi)
-
k8 = !k8
_numa_init(0, max_pfn);
+
amd = !amd
_numa_init(0, max_pfn);
#endif
#endif
- initmem_init(0, max_pfn, acpi,
k8
);
+ initmem_init(0, max_pfn, acpi,
amd
);
memblock_find_dma_reserve();
dma32_reserve_bootmem();
memblock_find_dma_reserve();
dma32_reserve_bootmem();
@@
-1033,10
+1035,7
@@
void __init setup_arch(char **cmdline_p)
#endif
init_apic_mappings();
#endif
init_apic_mappings();
- ioapic_init_mappings();
-
- /* need to wait for io_apic is mapped */
- probe_nr_irqs_gsi();
+ ioapic_and_gsi_init();
kvm_guest_init();
kvm_guest_init();