Pull percpu-dtc into release branch
This commit is contained in:
@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user