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
x86: Export k8 physical topology
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
setup.c
diff --git
a/arch/x86/kernel/setup.c
b/arch/x86/kernel/setup.c
index
e09f0e2
..
fda0032
100644
(file)
--- a/
arch/x86/kernel/setup.c
+++ b/
arch/x86/kernel/setup.c
@@
-106,6
+106,7
@@
#include <asm/percpu.h>
#include <asm/topology.h>
#include <asm/apicdef.h>
#include <asm/percpu.h>
#include <asm/topology.h>
#include <asm/apicdef.h>
+#include <asm/k8.h>
#ifdef CONFIG_X86_64
#include <asm/numa_64.h>
#endif
#ifdef CONFIG_X86_64
#include <asm/numa_64.h>
#endif
@@
-691,6
+692,9
@@
static struct dmi_system_id __initdata bad_bios_dmi_table[] = {
void __init setup_arch(char **cmdline_p)
{
void __init setup_arch(char **cmdline_p)
{
+ int acpi = 0;
+ int k8 = 0;
+
#ifdef CONFIG_X86_32
memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data));
visws_early_detect();
#ifdef CONFIG_X86_32
memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data));
visws_early_detect();
@@
-937,7
+941,11
@@
void __init setup_arch(char **cmdline_p)
acpi_numa_init();
#endif
acpi_numa_init();
#endif
- initmem_init(0, max_pfn);
+#ifdef CONFIG_K8_NUMA
+ k8 = !k8_numa_init(0, max_pfn);
+#endif
+
+ initmem_init(0, max_pfn, acpi, k8);
#ifdef CONFIG_ACPI_SLEEP
/*
#ifdef CONFIG_ACPI_SLEEP
/*