diff options
-rw-r--r-- | linux-2.6-xen-sparse/arch/xen/x86_64/kernel/apic.c | 3 | ||||
-rw-r--r-- | linux-2.6-xen-sparse/arch/xen/x86_64/mm/init.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/apic.c b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/apic.c index 797459b0e5..1971de2e88 100644 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/apic.c +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/apic.c @@ -45,10 +45,11 @@ int disable_apic; void smp_local_timer_interrupt(struct pt_regs *regs) { - int cpu = smp_processor_id(); profile_tick(CPU_PROFILING, regs); #ifndef CONFIG_XEN + int cpu = smp_processor_id(); + if (--per_cpu(prof_counter, cpu) <= 0) { /* * The multiplier may have changed since the last time we got diff --git a/linux-2.6-xen-sparse/arch/xen/x86_64/mm/init.c b/linux-2.6-xen-sparse/arch/xen/x86_64/mm/init.c index 7184cfbbea..26718dde73 100644 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/mm/init.c +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/mm/init.c @@ -557,8 +557,6 @@ static void xen_copy_pt(void) void __init xen_init_pt(void) { - pgd_t *old_level4 = (pgd_t *)xen_start_info.pt_base; - memcpy((void *)init_level4_pgt, (void *)xen_start_info.pt_base, PAGE_SIZE); |