direct-io.hg

changeset 4493:28c4d8ceff3c

bitkeeper revision 1.1278 (4253da21yTEi5Phz7s3xl9XLCC6A8w)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xeno-unstable-ia64.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@firebug.cl.cam.ac.uk
date Wed Apr 06 12:46:25 2005 +0000 (2005-04-06)
parents 0c8a248ff045 8e0cc71b63e6
children d946608e6ddc 5c90ed25ab58
files linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c linux-2.6.11-xen-sparse/arch/xen/i386/kernel/time.c
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c	Tue Apr 05 19:59:15 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c	Wed Apr 06 12:46:25 2005 +0000
     1.3 @@ -444,7 +444,7 @@ static irqreturn_t ldebug_interrupt(
     1.4  }
     1.5  
     1.6  static DEFINE_PER_CPU(int, ldebug_irq);
     1.7 -static char ldebug_name[NR_IRQS][15];
     1.8 +static char ldebug_name[NR_CPUS][15];
     1.9  
    1.10  void ldebug_setup(void)
    1.11  {
    1.12 @@ -1335,8 +1335,8 @@ extern irqreturn_t smp_call_function_int
    1.13  
    1.14  static DEFINE_PER_CPU(int, resched_irq);
    1.15  static DEFINE_PER_CPU(int, callfunc_irq);
    1.16 -static char resched_name[NR_IRQS][15];
    1.17 -static char callfunc_name[NR_IRQS][15];
    1.18 +static char resched_name[NR_CPUS][15];
    1.19 +static char callfunc_name[NR_CPUS][15];
    1.20  
    1.21  void __init smp_intr_init(void)
    1.22  {
     2.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/time.c	Tue Apr 05 19:59:15 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/time.c	Wed Apr 06 12:46:25 2005 +0000
     2.3 @@ -762,7 +762,7 @@ void time_resume(void)
     2.4  }
     2.5  
     2.6  #ifdef CONFIG_SMP
     2.7 -static char timer_name[NR_IRQS][15];
     2.8 +static char timer_name[NR_CPUS][15];
     2.9  void local_setup_timer(void)
    2.10  {
    2.11  	int seq, cpu = smp_processor_id();