diff options
| author | Tony Luck <tony.luck@intel.com> | 2007-04-30 13:56:00 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-04-30 13:56:00 -0700 |
| commit | b643b0fdbc59cf6bbb086974b29d2571e9e9f646 (patch) | |
| tree | 59d1a1298ffc98877183a8def5c180c0f74e568b /arch/ia64/kernel/setup.c | |
| parent | e0cc09e295f346b7921e921f385fe5213472316a (diff) | |
| parent | 00b65985fb2fc542b855b03fcda0d0f2bab4f442 (diff) | |
| download | blackbird-op-linux-b643b0fdbc59cf6bbb086974b29d2571e9e9f646.tar.gz blackbird-op-linux-b643b0fdbc59cf6bbb086974b29d2571e9e9f646.zip | |
Pull percpu-dtc into release branch
Diffstat (limited to 'arch/ia64/kernel/setup.c')
| -rw-r--r-- | arch/ia64/kernel/setup.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index dc7dd7648ec5..6e19da122ae3 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c @@ -75,7 +75,6 @@ extern void ia64_setup_printk_clock(void); DEFINE_PER_CPU(struct cpuinfo_ia64, cpu_info); DEFINE_PER_CPU(unsigned long, local_per_cpu_offset); -DEFINE_PER_CPU(unsigned long, ia64_phys_stacked_size_p8); unsigned long ia64_cycles_per_usec; struct ia64_boot_param *ia64_boot_param; struct screen_info screen_info; @@ -869,6 +868,7 @@ void __cpuinit cpu_init (void) { extern void __cpuinit ia64_mmu_init (void *); + static unsigned long max_num_phys_stacked = IA64_NUM_PHYS_STACK_REG; unsigned long num_phys_stacked; pal_vm_info_2_u_t vmi; unsigned int max_ctx; @@ -982,7 +982,10 @@ cpu_init (void) num_phys_stacked = 96; } /* size of physical stacked register partition plus 8 bytes: */ - __get_cpu_var(ia64_phys_stacked_size_p8) = num_phys_stacked*8 + 8; + if (num_phys_stacked > max_num_phys_stacked) { + ia64_patch_phys_stack_reg(num_phys_stacked*8 + 8); + max_num_phys_stacked = num_phys_stacked; + } platform_cpu_init(); pm_idle = default_idle; } |
