diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 15:49:35 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 15:49:35 -0500 |
| commit | 28e93a005b65cc5b4f569642e9c7903618ea5fe1 (patch) | |
| tree | 3c98b8dc457b05b290ad640c413e453a264739bf /arch/x86/kernel/setup.c | |
| parent | caab36b593b44c97e3c7707c6a8054b320f8d622 (diff) | |
| parent | ed26dbe5ae045e5bf95c6dc27497397a3fde52e1 (diff) | |
Merge branch 'x86/mm' into x86/core
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index b746deb9ebc6..f28c56e6bf94 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
| @@ -202,7 +202,9 @@ struct ist_info ist_info; | |||
| 202 | #endif | 202 | #endif |
| 203 | 203 | ||
| 204 | #else | 204 | #else |
| 205 | struct cpuinfo_x86 boot_cpu_data __read_mostly; | 205 | struct cpuinfo_x86 boot_cpu_data __read_mostly = { |
| 206 | .x86_phys_bits = MAX_PHYSMEM_BITS, | ||
| 207 | }; | ||
| 206 | EXPORT_SYMBOL(boot_cpu_data); | 208 | EXPORT_SYMBOL(boot_cpu_data); |
| 207 | #endif | 209 | #endif |
| 208 | 210 | ||