ia64/xen-unstable

changeset 839:c727b650bf0c

bitkeeper revision 1.521 (3f8d37346rDopjoEe3cyqj2ebjNMJw)

keyhandler.c:
Remove P6-specific keyhandlers in Xen that crash P4.
author kaf24@scramble.cl.cam.ac.uk
date Wed Oct 15 12:01:56 2003 +0000 (2003-10-15)
parents 71f9c171157e
children d75063d55d8e
files xen/common/keyhandler.c
line diff
     1.1 --- a/xen/common/keyhandler.c	Wed Oct 15 09:31:04 2003 +0000
     1.2 +++ b/xen/common/keyhandler.c	Wed Oct 15 12:01:56 2003 +0000
     1.3 @@ -128,27 +128,6 @@ void do_task_queues(u_char key, void *de
     1.4      read_unlock_irqrestore(&tasklist_lock, flags); 
     1.5  }
     1.6  
     1.7 -void cpu_counters(u_char key, void *dev_id, struct pt_regs *regs)
     1.8 -{
     1.9 -    printk("CPU performance counters for CPU %d (current):\n",
    1.10 -        smp_processor_id());
    1.11 -    {
    1.12 -        unsigned int one1,one2,zero1,zero2;
    1.13 -        rdmsr(MSR_P6_PERFCTR0, zero1, zero2);
    1.14 -        rdmsr(MSR_P6_PERFCTR1, one1, one2);
    1.15 -        printk("CPU%02d counter0=0x%02x:%08x  counter1=0x%02x:%08x\n",
    1.16 -           smp_processor_id(), zero2,zero1,one2,one1 );
    1.17 -    }
    1.18 -}
    1.19 -
    1.20 -void cpu_counters_reset(u_char key, void *dev_id, struct pt_regs *regs)
    1.21 -{
    1.22 -    printk("Reset CPU performance counters for CPU %d (current):\n",
    1.23 -	smp_processor_id());
    1.24 -    wrmsr(MSR_P6_PERFCTR0,0,0);
    1.25 -    wrmsr(MSR_P6_PERFCTR1,0,0);
    1.26 -}
    1.27 -
    1.28  extern void perfc_printall (u_char key, void *dev_id, struct pt_regs *regs);
    1.29  extern void perfc_reset (u_char key, void *dev_id, struct pt_regs *regs);
    1.30  extern void dump_runq(u_char key, void *dev_id, struct pt_regs *regs);
    1.31 @@ -175,7 +154,5 @@ void initialize_keytable()
    1.32      add_key_handler('r', dump_runq,      "dump run queues");
    1.33      add_key_handler('B', kill_dom0,      "reboot machine gracefully"); 
    1.34      add_key_handler('R', halt_machine,   "reboot machine ungracefully"); 
    1.35 -    add_key_handler('c', cpu_counters,   "CPU performance counters");
    1.36 -    add_key_handler('C', cpu_counters_reset,"reset CPU perfomance counters");    
    1.37      return; 
    1.38  }