ia64/xen-unstable

changeset 3287:545088ce72b5

bitkeeper revision 1.1159.1.480 (41c07efbnheltqmPvYvCi8GYyKjgbg)

cleanup.
author cl349@arcadians.cl.cam.ac.uk
date Wed Dec 15 18:14:19 2004 +0000 (2004-12-15)
parents a5b20d4d45b1
children 1a1036639bf5
files linux-2.6.9-xen-sparse/arch/xen/i386/kernel/smpboot.c linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c xen/arch/x86/memory.c xen/common/domain.c xen/common/event_channel.c
line diff
     1.1 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/smpboot.c	Wed Dec 15 17:37:24 2004 +0000
     1.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/smpboot.c	Wed Dec 15 18:14:19 2004 +0000
     1.3 @@ -53,7 +53,6 @@
     1.4  
     1.5  #if 1
     1.6  #define Dprintk(args...)
     1.7 -#define xxprint(msg) HYPERVISOR_console_io(CONSOLEIO_write, strlen(msg), msg)
     1.8  #else
     1.9  #include <mach_apic.h>
    1.10  #endif
    1.11 @@ -116,7 +115,6 @@ void __init smp_alloc_memory(void)
    1.12  #if 1
    1.13  	int cpu;
    1.14  
    1.15 -	xxprint("smp_alloc_memory\n");
    1.16  	for (cpu = 1; cpu < NR_CPUS; cpu++) {
    1.17  		cpu_gdt_descr[cpu].address = (unsigned long)
    1.18  			alloc_bootmem_low_pages(PAGE_SIZE);
    1.19 @@ -445,7 +443,6 @@ extern int cpu_idle(void);
    1.20  static irqreturn_t local_debug_interrupt(int irq, void *dev_id,
    1.21  					 struct pt_regs *regs)
    1.22  {
    1.23 -	xxprint("local_debug_interrupt\n");
    1.24  
    1.25  	return IRQ_HANDLED;
    1.26  }
    1.27 @@ -674,10 +671,6 @@ wakeup_secondary_cpu(int logical_apicid,
    1.28  static int __init
    1.29  wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip)
    1.30  {
    1.31 -#if 1
    1.32 -	xxprint("wakeup_secondary_cpu\n");
    1.33 -	return 0;
    1.34 -#else
    1.35  	unsigned long send_status = 0, accept_status = 0;
    1.36  	int maxlvt, timeout, num_starts, j;
    1.37  
    1.38 @@ -806,7 +799,6 @@ wakeup_secondary_cpu(int phys_apicid, un
    1.39  		printk("APIC delivery error (%lx).\n", accept_status);
    1.40  
    1.41  	return (send_status | accept_status);
    1.42 -#endif
    1.43  }
    1.44  #endif	/* WAKE_SECONDARY_VIA_INIT */
    1.45  #endif
    1.46 @@ -1286,7 +1278,6 @@ static void __init smp_boot_cpus(unsigne
    1.47  	if (cpu_has_tsc && cpucount && cpu_khz)
    1.48  		synchronize_tsc_bp();
    1.49  #endif
    1.50 -	xxprint("smp_boot_cpus done\n");
    1.51  }
    1.52  
    1.53  /* These are wrappers to interface to the new boot process.  Someone
    1.54 @@ -1304,7 +1295,6 @@ void __devinit smp_prepare_boot_cpu(void
    1.55  
    1.56  int __devinit __cpu_up(unsigned int cpu)
    1.57  {
    1.58 -	xxprint("__cpu_up\n");
    1.59  	/* This only works at boot for x86.  See "rewrite" above. */
    1.60  	if (cpu_isset(cpu, smp_commenced_mask)) {
    1.61  		local_irq_enable();
    1.62 @@ -1322,7 +1312,6 @@ int __devinit __cpu_up(unsigned int cpu)
    1.63  	cpu_set(cpu, smp_commenced_mask);
    1.64  	while (!cpu_isset(cpu, cpu_online_map))
    1.65  		mb();
    1.66 -	xxprint("__cpu_up ok\n");
    1.67  	return 0;
    1.68  }
    1.69  
     2.1 --- a/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c	Wed Dec 15 17:37:24 2004 +0000
     2.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c	Wed Dec 15 18:14:19 2004 +0000
     2.3 @@ -497,22 +497,6 @@ void setup_misdirect_virq(void)
     2.4      (void)setup_irq(bind_virq_to_irq(VIRQ_MISDIRECT), &misdirect_action);
     2.5  }
     2.6  
     2.7 -static irqreturn_t xen_dbg(int irq, void *dev_id, struct pt_regs *regs)
     2.8 -{
     2.9 -     char *msg = "debug\n";
    2.10 -     (void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(msg), msg);
    2.11 -     return IRQ_HANDLED;
    2.12 -}
    2.13 -
    2.14 -static struct irqaction xen_action = {
    2.15 -    xen_dbg, 
    2.16 -    SA_INTERRUPT, 
    2.17 -    CPU_MASK_CPU0, 
    2.18 -    "xen-dbg", 
    2.19 -    NULL, 
    2.20 -    NULL
    2.21 -};
    2.22 -
    2.23  void irq_suspend(void)
    2.24  {
    2.25      int pirq, virq, irq, evtchn;
    2.26 @@ -617,9 +601,6 @@ void __init init_IRQ(void)
    2.27  
    2.28      (void)setup_misdirect_virq();
    2.29  
    2.30 -    printk("debug_int\n");
    2.31 -	(void)setup_irq(bind_virq_to_irq(VIRQ_DEBUG), &xen_action);
    2.32 -
    2.33      /* This needs to be done early, but after the IRQ subsystem is alive. */
    2.34      ctrl_if_init();
    2.35  }
     3.1 --- a/xen/arch/x86/memory.c	Wed Dec 15 17:37:24 2004 +0000
     3.2 +++ b/xen/arch/x86/memory.c	Wed Dec 15 18:14:19 2004 +0000
     3.3 @@ -1690,7 +1690,7 @@ void ptwr_flush(const int which)
     3.4  
     3.5      /* Ensure that there are no stale writable mappings in any TLB. */
     3.6      /* NB. INVLPG is a serialising instruction: flushes pending updates. */
     3.7 -#if 0
     3.8 +#if 1
     3.9      __flush_tlb_one(l1va); /* XXX Multi-CPU guests? */
    3.10  #else
    3.11      flush_tlb_all();
    3.12 @@ -1862,7 +1862,7 @@ int ptwr_do_page_fault(unsigned long add
    3.13      if ( (which == PTWR_PT_ACTIVE) && likely(!current->mm.shadow_mode) )
    3.14      {
    3.15          *pl2e = mk_l2_pgentry(l2e & ~_PAGE_PRESENT);
    3.16 -#if 0
    3.17 +#if 1
    3.18          flush_tlb(); /* XXX Multi-CPU guests? */
    3.19  #else
    3.20          flush_tlb_all();
     4.1 --- a/xen/common/domain.c	Wed Dec 15 17:37:24 2004 +0000
     4.2 +++ b/xen/common/domain.c	Wed Dec 15 18:14:19 2004 +0000
     4.3 @@ -323,8 +323,6 @@ long do_boot_vcpu(unsigned long vcpu, fu
     4.4          goto out;
     4.5      }
     4.6  
     4.7 -    printk("do_boot_vcpu for dom %d vcpu %ld\n", d->id, vcpu);
     4.8 -
     4.9      ed = d->exec_domain[vcpu];
    4.10  
    4.11      atomic_set(&ed->pausecnt, 0);
     5.1 --- a/xen/common/event_channel.c	Wed Dec 15 17:37:24 2004 +0000
     5.2 +++ b/xen/common/event_channel.c	Wed Dec 15 18:14:19 2004 +0000
     5.3 @@ -277,8 +277,6 @@ static long evtchn_bind_virq(evtchn_bind
     5.4          return port;
     5.5  
     5.6      bind->port = port;
     5.7 -    printk("evtchn_bind_virq %d/%d virq %d -> %d\n",
     5.8 -           d->id, ed->eid, virq, port);
     5.9      return 0;
    5.10  }
    5.11  
    5.12 @@ -302,8 +300,6 @@ static long evtchn_bind_ipi(evtchn_bind_
    5.13          return port;
    5.14  
    5.15      bind->port = port;
    5.16 -    printk("evtchn_bind_ipi %d/%d ipi_edom %d -> %d\n",
    5.17 -           d->id, current->eid, ipi_edom, port);
    5.18      return 0;
    5.19  }
    5.20  
    5.21 @@ -341,8 +337,6 @@ static long evtchn_bind_pirq(evtchn_bind
    5.22          return rc;
    5.23  
    5.24      bind->port = port;
    5.25 -    printk("evtchn_bind_pirq %d/%d pirq %d -> port %d\n",
    5.26 -           d->id, current->eid, pirq, port);
    5.27      return 0;
    5.28  }
    5.29