WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] Cleanup whitespace.

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID e9daf53072961711ec92ae7c868e30f373f18bc8
# Parent  085f0ad9018a0791c89ac8f489f630eab3f0c04b
Cleanup whitespace.

Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>

diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/arch/i386/kernel/entry-xen.S
--- a/linux-2.6-xen-sparse/arch/i386/kernel/entry-xen.S Mon Mar  6 17:05:09 2006
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/entry-xen.S Mon Mar  6 17:15:10 2006
@@ -560,7 +560,7 @@
        jmp  ret_from_intr
 
         ALIGN
-restore_all_enable_events:  
+restore_all_enable_events:
        XEN_LOCKED_UNBLOCK_EVENTS(%esi)
 scrit: /**** START OF CRITICAL REGION ****/
        XEN_TEST_PENDING(%esi)
@@ -577,7 +577,7 @@
 # registers are in each frame. We do this quickly using the lookup table
 # 'critical_fixup_table'. For each byte offset in the critical region, it
 # provides the number of bytes which have already been popped from the
-# interrupted stack frame. 
+# interrupted stack frame.
 critical_region_fixup:
        addl $critical_fixup_table-scrit,%eax
        movzbl (%eax),%eax              # %eax contains num bytes popped
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S
--- a/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S  Mon Mar  6 17:05:09 2006
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S  Mon Mar  6 17:15:10 2006
@@ -29,8 +29,6 @@
 
        /* Set up the stack pointer */
        movl $(init_thread_union+THREAD_SIZE),%esp
-
-checkCPUtype:
 
        /* get vendor info */
        xorl %eax,%eax                  # call CPUID with 0 -> return vendor ID
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c       Mon Mar  6 
17:05:09 2006
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c       Mon Mar  6 
17:15:10 2006
@@ -107,9 +107,9 @@
 {
        local_irq_disable();
 
-       if (need_resched()) {
+       if (need_resched())
                local_irq_enable();
-       } else {
+       else {
                clear_thread_flag(TIF_POLLING_NRFLAG);
                smp_mb__after_clear_bit();
                stop_hz_timer();
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c  Mon Mar  6 17:05:09 2006
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c  Mon Mar  6 17:15:10 2006
@@ -162,13 +162,12 @@
 static void delay_tsc(unsigned long loops)
 {
        unsigned long bclock, now;
-       
+
        rdtscl(bclock);
-       do
-       {
+       do {
                rep_nop();
                rdtscl(now);
-       } while ((now-bclock) < loops);
+       } while ((now - bclock) < loops);
 }
 
 struct timer_opts timer_tsc = {
@@ -187,7 +186,7 @@
        u32 tmp1, tmp2;
 #endif
 
-       if ( shift < 0 )
+       if (shift < 0)
                delta >>= -shift;
        else
                delta <<= shift;
@@ -226,7 +225,7 @@
        struct vcpu_time_info *info;
        info = &HYPERVISOR_shared_info->vcpu_info[0].time;
        do_div(__cpu_khz, info->tsc_to_system_mul);
-       if ( info->tsc_shift < 0 )
+       if (info->tsc_shift < 0)
                cpu_khz = __cpu_khz << -info->tsc_shift;
        else
                cpu_khz = __cpu_khz >> info->tsc_shift;
@@ -284,8 +283,7 @@
                shadow_tv.tv_sec  = s->wc_sec;
                shadow_tv.tv_nsec = s->wc_nsec;
                rmb();
-       }
-       while ((s->wc_version & 1) | (shadow_tv_version ^ s->wc_version));
+       } while ((s->wc_version & 1) | (shadow_tv_version ^ s->wc_version));
 
        if (!independent_wallclock)
                __update_wallclock(shadow_tv.tv_sec, shadow_tv.tv_nsec);
@@ -312,8 +310,7 @@
                dst->tsc_to_nsec_mul   = src->tsc_to_system_mul;
                dst->tsc_shift         = src->tsc_shift;
                rmb();
-       }
-       while ((src->version & 1) | (dst->version ^ src->version));
+       } while ((src->version & 1) | (dst->version ^ src->version));
 
        dst->tsc_to_usec_mul = dst->tsc_to_nsec_mul / 1000;
 }
@@ -324,7 +321,7 @@
        struct shadow_time_info *dst;
 
        src = &HYPERVISOR_shared_info->vcpu_info[cpu].time;
-       dst = &per_cpu(shadow_time, cpu); 
+       dst = &per_cpu(shadow_time, cpu);
 
        return (dst->version == src->version);
 }
@@ -454,7 +451,7 @@
         * overflows. If that were to happen then our shadow time values would
         * be stale, so we can retry with fresh ones.
         */
-       for ( ; ; ) {
+       for (;;) {
                nsec = tv->tv_nsec - get_nsec_offset(shadow);
                if (time_values_up_to_date(cpu))
                        break;
@@ -614,7 +611,7 @@
                get_time_values_from_xen();
 
                /* Obtain a consistent snapshot of elapsed wallclock cycles. */
-               delta = delta_cpu = 
+               delta = delta_cpu =
                        shadow->system_timestamp + get_nsec_offset(shadow);
                delta     -= processed_system_time;
                delta_cpu -= per_cpu(processed_system_time, cpu);
@@ -633,8 +630,7 @@
                                per_cpu(processed_blocked_time, cpu);
                        barrier();
                } while (sched_time != runstate->state_entry_time);
-       }
-       while (!time_values_up_to_date(cpu));
+       } while (!time_values_up_to_date(cpu));
 
        if ((unlikely(delta < -1000000LL) || unlikely(delta_cpu < 0))
            && printk_ratelimit()) {
@@ -938,7 +934,7 @@
 }
 
 /* Convert jiffies to system time. */
-static inline u64 jiffies_to_st(unsigned long j) 
+static inline u64 jiffies_to_st(unsigned long j)
 {
        unsigned long seq;
        long delta;
@@ -949,7 +945,7 @@
                delta = j - jiffies;
                /* NB. The next check can trigger in some wrap-around cases,
                 * but that's ok: we'll just end up with a shorter timeout. */
-               if (delta < 1) 
+               if (delta < 1)
                        delta = 1;
                st = processed_system_time + (delta * (u64)NS_PER_TICK);
        } while (read_seqretry(&xtime_lock, seq));
@@ -965,7 +961,7 @@
 {
        unsigned int cpu = smp_processor_id();
        unsigned long j;
-       
+
        /* We must do this /before/ checking rcu_pending(). */
        cpu_set(cpu, nohz_cpu_mask);
        smp_mb();
@@ -1012,7 +1008,7 @@
        do {
                seq = read_seqbegin(&xtime_lock);
                /* Use cpu0 timestamp: cpu's shadow is not initialised yet. */
-               per_cpu(processed_system_time, cpu) = 
+               per_cpu(processed_system_time, cpu) =
                        per_cpu(shadow_time, 0).system_timestamp;
                init_missing_ticks_accounting(cpu);
        } while (read_seqretry(&xtime_lock, seq));
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c     Mon Mar  6 
17:05:09 2006
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c     Mon Mar  6 
17:15:10 2006
@@ -124,9 +124,9 @@
 {
        local_irq_disable();
 
-       if (need_resched()) {
+       if (need_resched())
                local_irq_enable();
-       } else {
+       else {
                clear_thread_flag(TIF_POLLING_NRFLAG);
                smp_mb__after_clear_bit();
                stop_hz_timer();
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c      Mon Mar  6 
17:05:09 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c      Mon Mar  6 
17:15:10 2006
@@ -182,9 +182,8 @@
        }
 
        err = xenbus_switch_state(dev, xbt, XenbusStateInitialised);
-       if (err) {
+       if (err)
                goto abort_transaction;
-       }
 
        err = xenbus_transaction_end(xbt, 0);
        if (err) {
@@ -295,17 +294,17 @@
 /* ** Connection ** */
 
 
-/* 
-** Invoked when the backend is finally 'ready' (and has told produced 
-** the details about the physical device - #sectors, size, etc). 
-*/
+/*
+ * Invoked when the backend is finally 'ready' (and has told produced
+ * the details about the physical device - #sectors, size, etc).
+ */
 static void connect(struct blkfront_info *info)
 {
        unsigned long sectors, sector_size;
        unsigned int binfo;
        int err;
 
-        if( (info->connected == BLKIF_STATE_CONNECTED) || 
+       if ((info->connected == BLKIF_STATE_CONNECTED) ||
            (info->connected == BLKIF_STATE_SUSPENDED) )
                return;
 
@@ -330,7 +329,7 @@
                return;
        }
 
-       (void)xenbus_switch_state(info->xbdev, XBT_NULL, XenbusStateConnected); 
+       (void)xenbus_switch_state(info->xbdev, XBT_NULL, XenbusStateConnected);
 
        /* Kick pending requests. */
        spin_lock_irq(&blkif_io_lock);
@@ -463,8 +462,7 @@
        DPRINTK_IOCTL("command: 0x%x, argument: 0x%lx, dev: 0x%04x\n",
                      command, (long)argument, inode->i_rdev);
 
-       switch ( command )
-       {
+       switch (command) {
        case HDIO_GETGEO:
                /* return ENOSYS to use defaults */
                return -ENOSYS;
@@ -490,7 +488,7 @@
  * blkif_queue_request
  *
  * request block io
- * 
+ *
  * id: for guest use only.
  * operation: BLKIF_OP_{READ,WRITE,PROBE}
  * buffer: buffer to read/write into. this should be a
@@ -557,7 +555,7 @@
                        ring_req->seg[ring_req->nr_segments] =
                                (struct blkif_request_segment) {
                                        .gref       = ref,
-                                       .first_sect = fsect, 
+                                       .first_sect = fsect,
                                        .last_sect  = lsect };
 
                        ring_req->nr_segments++;
@@ -679,9 +677,8 @@
                RING_FINAL_CHECK_FOR_RESPONSES(&info->ring, more_to_do);
                if (more_to_do)
                        goto again;
-       } else {
+       } else
                info->ring.sring->rsp_event = i + 1;
-       }
 
        kick_pending_request_queues(info);
 
@@ -694,8 +691,8 @@
 {
        /* Prevent new requests being issued until we fix things up. */
        spin_lock_irq(&blkif_io_lock);
-       info->connected = suspend ? 
-               BLKIF_STATE_SUSPENDED : BLKIF_STATE_DISCONNECTED; 
+       info->connected = suspend ?
+               BLKIF_STATE_SUSPENDED : BLKIF_STATE_DISCONNECTED;
        spin_unlock_irq(&blkif_io_lock);
 
        /* Free resources associated with old device channel. */
@@ -706,7 +703,7 @@
                info->ring.sring = NULL;
        }
        if (info->irq)
-               unbind_from_irqhandler(info->irq, info); 
+               unbind_from_irqhandler(info->irq, info);
        info->evtchn = info->irq = 0;
 
 }
@@ -767,11 +764,11 @@
 
        kfree(copy);
 
-       (void)xenbus_switch_state(info->xbdev, XBT_NULL, XenbusStateConnected); 
-       
+       (void)xenbus_switch_state(info->xbdev, XBT_NULL, XenbusStateConnected);
+
        /* Now safe for us to use the shared ring */
        spin_lock_irq(&blkif_io_lock);
-        info->connected = BLKIF_STATE_CONNECTED;
+       info->connected = BLKIF_STATE_CONNECTED;
        spin_unlock_irq(&blkif_io_lock);
 
        /* Send off requeued requests */
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h Mon Mar  6 17:05:09 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h Mon Mar  6 17:15:10 2006
@@ -55,24 +55,24 @@
 #include <asm/atomic.h>
 #include <asm/uaccess.h>
 
-#if 1 
+#if 1
 #define IPRINTK(fmt, args...) \
     printk(KERN_INFO "xen_blk: " fmt, ##args)
 #else
 #define IPRINTK(fmt, args...) ((void)0)
 #endif
 
-#if 1 
+#if 1
 #define WPRINTK(fmt, args...) \
     printk(KERN_WARNING "xen_blk: " fmt, ##args)
 #else
 #define WPRINTK(fmt, args...) ((void)0)
 #endif
- 
-#define DPRINTK(_f, _a...) pr_debug ( _f , ## _a )
+
+#define DPRINTK(_f, _a...) pr_debug(_f, ## _a)
 
 #if 0
-#define DPRINTK_IOCTL(_f, _a...) printk ( KERN_ALERT _f , ## _a )
+#define DPRINTK_IOCTL(_f, _a...) printk(KERN_ALERT _f, ## _a)
 #else
 #define DPRINTK_IOCTL(_f, _a...) ((void)0)
 #endif
@@ -139,7 +139,7 @@
                        unsigned command, unsigned long argument);
 extern int blkif_check(dev_t dev);
 extern int blkif_revalidate(dev_t dev);
-extern void do_blkif_request (request_queue_t *rq); 
+extern void do_blkif_request (request_queue_t *rq);
 
 /* Virtual block-device subsystem. */
 /* Note that xlvbd_add doesn't call add_disk for you: you're expected
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/drivers/xen/console/console.c
--- a/linux-2.6-xen-sparse/drivers/xen/console/console.c        Mon Mar  6 
17:05:09 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c        Mon Mar  6 
17:15:10 2006
@@ -85,8 +85,7 @@
        else if (!strncmp(str, "off", 3))
                xc_mode = XC_OFF;
 
-       switch ( xc_mode )
-       {
+       switch (xc_mode) {
        case XC_SERIAL:
                n = simple_strtol(str+4, &q, 10);
                if (q > (str + 4))
@@ -227,7 +226,7 @@
        va_list args;
        int printk_len;
        static char printk_buf[1024];
-    
+
        /* Emit the output into the temporary buffer */
        va_start(args, fmt);
        printk_len = vsnprintf(printk_buf, sizeof(printk_buf), fmt, args);
@@ -485,7 +484,7 @@
 
        spin_lock_irqsave(&xencons_lock, flags);
        __xencons_tx_flush();
-       spin_unlock_irqrestore(&xencons_lock, flags);    
+       spin_unlock_irqrestore(&xencons_lock, flags);
 }
 
 static void xencons_wait_until_sent(struct tty_struct *tty, int timeout)
@@ -495,17 +494,15 @@
        if (TTY_INDEX(tty) != 0)
                return;
 
-       while (DRV(tty->driver)->chars_in_buffer(tty))
-       {
+       while (DRV(tty->driver)->chars_in_buffer(tty)) {
                set_current_state(TASK_INTERRUPTIBLE);
                schedule_timeout(1);
                if (signal_pending(current))
                        break;
-               if ( (timeout != 0) &&
-                    time_after(jiffies, orig_jiffies + timeout) )
+               if (timeout && time_after(jiffies, orig_jiffies + timeout))
                        break;
        }
-    
+
        set_current_state(TASK_RUNNING);
 }
 
@@ -521,7 +518,7 @@
        if (xencons_tty == NULL)
                xencons_tty = tty;
        __xencons_tx_flush();
-       spin_unlock_irqrestore(&xencons_lock, flags);    
+       spin_unlock_irqrestore(&xencons_lock, flags);
 
        return 0;
 }
@@ -543,7 +540,7 @@
                tty->closing = 0;
                spin_lock_irqsave(&xencons_lock, flags);
                xencons_tty = NULL;
-               spin_unlock_irqrestore(&xencons_lock, flags);    
+               spin_unlock_irqrestore(&xencons_lock, flags);
        }
 }
 
@@ -574,7 +571,7 @@
 
        xencons_ring_init();
 
-       xencons_driver = alloc_tty_driver((xc_mode == XC_SERIAL) ? 
+       xencons_driver = alloc_tty_driver((xc_mode == XC_SERIAL) ?
                                          1 : MAX_NR_CONSOLES);
        if (xencons_driver == NULL)
                return -ENOMEM;
@@ -584,15 +581,14 @@
        DRV(xencons_driver)->type            = TTY_DRIVER_TYPE_SERIAL;
        DRV(xencons_driver)->subtype         = SERIAL_TYPE_NORMAL;
        DRV(xencons_driver)->init_termios    = tty_std_termios;
-       DRV(xencons_driver)->flags           = 
+       DRV(xencons_driver)->flags           =
                TTY_DRIVER_REAL_RAW |
                TTY_DRIVER_RESET_TERMIOS |
                TTY_DRIVER_NO_DEVFS;
        DRV(xencons_driver)->termios         = xencons_termios;
        DRV(xencons_driver)->termios_locked  = xencons_termios_locked;
 
-       if (xc_mode == XC_SERIAL)
-       {
+       if (xc_mode == XC_SERIAL) {
                DRV(xencons_driver)->name        = "ttyS";
                DRV(xencons_driver)->minor_start = 64 + xc_num;
                DRV(xencons_driver)->name_base   = 0 + xc_num;
@@ -630,7 +626,7 @@
        printk("Xen virtual console successfully installed as %s%d\n",
               DRV(xencons_driver)->name,
               DRV(xencons_driver)->name_base );
-    
+
        return 0;
 }
 
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/drivers/xen/console/xencons_ring.c
--- a/linux-2.6-xen-sparse/drivers/xen/console/xencons_ring.c   Mon Mar  6 
17:05:09 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/console/xencons_ring.c   Mon Mar  6 
17:15:10 2006
@@ -55,7 +55,7 @@
        notify_daemon();
 
        return sent;
-}      
+}
 
 static irqreturn_t handle_input(int irq, void *unused, struct pt_regs *regs)
 {
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/drivers/xen/core/evtchn.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/evtchn.c    Mon Mar  6 17:05:09 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/core/evtchn.c    Mon Mar  6 17:15:10 2006
@@ -72,7 +72,7 @@
 
 /* IRQ <-> IPI mapping. */
 #ifndef NR_IPIS
-#define NR_IPIS 1 
+#define NR_IPIS 1
 #endif
 DEFINE_PER_CPU(int, ipi_to_irq[NR_IPIS]);
 
@@ -209,7 +209,7 @@
        irq_bindcount[irq]++;
 
        spin_unlock(&irq_mapping_update_lock);
-    
+
        return irq;
 }
 
@@ -238,7 +238,7 @@
        irq_bindcount[irq]++;
 
        spin_unlock(&irq_mapping_update_lock);
-    
+
        return irq;
 }
 
@@ -535,9 +535,9 @@
        /* NB. We are happy to share unless we are probing. */
        op.u.bind_pirq.flags = probing_irq(irq) ? 0 : BIND_PIRQ__WILL_SHARE;
        if (HYPERVISOR_event_channel_op(&op) != 0) {
-               if ( !probing_irq(irq) )
-                       printk(KERN_INFO "Failed to obtain physical "
-                              "IRQ %d\n", irq);
+               if (!probing_irq(irq))
+                       printk(KERN_INFO "Failed to obtain physical IRQ %d\n",
+                              irq);
                return 0;
        }
        evtchn = op.u.bind_pirq.port;
@@ -669,7 +669,7 @@
         * like a real IO-APIC we 'lose the interrupt edge' if the channel is
         * masked.
         */
-       if (synch_test_bit(port, &s->evtchn_pending[0]) && 
+       if (synch_test_bit(port, &s->evtchn_pending[0]) &&
            !synch_test_and_set_bit(port / BITS_PER_LONG,
                                    &vcpu_info->evtchn_pending_sel)) {
                vcpu_info->evtchn_upcall_pending = 1;
@@ -722,7 +722,7 @@
                op.u.bind_virq.vcpu = 0;
                BUG_ON(HYPERVISOR_event_channel_op(&op) != 0);
                evtchn = op.u.bind_virq.port;
-        
+
                /* Record the new mapping. */
                evtchn_to_irq[evtchn] = irq;
                irq_info[irq] = mk_irq_info(IRQT_VIRQ, virq, evtchn);
@@ -744,7 +744,7 @@
                op.u.bind_ipi.vcpu = 0;
                BUG_ON(HYPERVISOR_event_channel_op(&op) != 0);
                evtchn = op.u.bind_ipi.port;
-        
+
                /* Record the new mapping. */
                evtchn_to_irq[evtchn] = irq;
                irq_info[irq] = mk_irq_info(IRQT_IPI, ipi, evtchn);
@@ -794,8 +794,7 @@
        }
 
        /* Phys IRQ space is statically bound (1:1 mapping). Nail refcnts. */
-       for (i = 0; i < NR_PIRQS; i++)
-       {
+       for (i = 0; i < NR_PIRQS; i++) {
                irq_bindcount[pirq_to_irq(i)] = 1;
 
 #ifdef RTC_IRQ
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/drivers/xen/core/features.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/features.c  Mon Mar  6 17:05:09 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/core/features.c  Mon Mar  6 17:15:10 2006
@@ -19,7 +19,7 @@
        xen_feature_info_t fi;
        int i, j;
 
-       for (i=0; i<XENFEAT_NR_SUBMAPS; i++) {
+       for (i = 0; i < XENFEAT_NR_SUBMAPS; i++) {
                fi.submap_idx = i;
                if (HYPERVISOR_xen_version(XENVER_get_features, &fi) < 0)
                        break;
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/drivers/xen/core/gnttab.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c    Mon Mar  6 17:05:09 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c    Mon Mar  6 17:15:10 2006
@@ -40,7 +40,7 @@
 
 #if 1
 #define ASSERT(_p)                                                           \
-       if ( !(_p) ) { printk(KERN_ALERT"Assertion '%s': line %d, file %s\n", \
+       if (!(_p)) { printk(KERN_ALERT"Assertion '%s': line %d, file %s\n",   \
        #_p , __LINE__, __FILE__); *(int*)0=0; }
 #else
 #define ASSERT(_p) ((void)0)
@@ -152,7 +152,7 @@
 gnttab_grant_foreign_access(domid_t domid, unsigned long frame, int readonly)
 {
        int ref;
-    
+
        if (unlikely((ref = get_free_entry()) == -1))
                return -ENOSPC;
 
@@ -192,13 +192,12 @@
 
        nflags = shared[ref].flags;
        do {
-               if ( (flags = nflags) & (GTF_reading|GTF_writing) ) {
+               if ((flags = nflags) & (GTF_reading|GTF_writing)) {
                        printk(KERN_ALERT "WARNING: g.e. still in use!\n");
                        return 0;
                }
-       }
-       while ((nflags = synch_cmpxchg(&shared[ref].flags, flags, 0)) !=
-              flags);
+       } while ((nflags = synch_cmpxchg(&shared[ref].flags, flags, 0)) !=
+                flags);
 
        return 1;
 }
@@ -211,8 +210,7 @@
                if (page != 0) {
                        free_page(page);
                }
-       }
-       else {
+       } else {
                /* XXX This needs to be fixed so that the ref and page are
                   placed on a list to be freed up later. */
                printk(KERN_WARNING
@@ -253,7 +251,7 @@
          * reference and return failure (== 0).
          */
        while (!((flags = shared[ref].flags) & GTF_transfer_committed)) {
-               if ( synch_cmpxchg(&shared[ref].flags, flags, 0) == flags )
+               if (synch_cmpxchg(&shared[ref].flags, flags, 0) == flags)
                        return 0;
                cpu_relax();
        }
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/drivers/xen/core/reboot.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/reboot.c    Mon Mar  6 17:05:09 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/core/reboot.c    Mon Mar  6 17:15:10 2006
@@ -29,10 +29,11 @@
 #define SHUTDOWN_POWEROFF  0
 #define SHUTDOWN_REBOOT    1
 #define SHUTDOWN_SUSPEND   2
-// Code 3 is SHUTDOWN_CRASH, which we don't use because the domain can only
-// report a crash, not be instructed to crash!
-// HALT is the same as POWEROFF, as far as we're concerned.  The tools use
-// the distinction when we return the reason code to them.
+/* Code 3 is SHUTDOWN_CRASH, which we don't use because the domain can only
+ * report a crash, not be instructed to crash!
+ * HALT is the same as POWEROFF, as far as we're concerned.  The tools use
+ * the distinction when we return the reason code to them.
+ */
 #define SHUTDOWN_HALT      4
 
 void machine_emergency_restart(void)
@@ -84,13 +85,13 @@
 {
        int i, j, k, fpp;
 
-       extern int gnttab_suspend(void);
-       extern int gnttab_resume(void);
-
-       extern void time_resume(void);
        extern unsigned long max_pfn;
        extern unsigned long *pfn_to_mfn_frame_list_list;
        extern unsigned long *pfn_to_mfn_frame_list[];
+
+       extern int gnttab_suspend(void);
+       extern int gnttab_resume(void);
+       extern void time_resume(void);
 
 #ifdef CONFIG_SMP
        cpumask_t prev_online_cpus;
@@ -167,26 +168,26 @@
         */
        HYPERVISOR_suspend(virt_to_mfn(xen_start_info));
 
-       shutting_down = SHUTDOWN_INVALID; 
+       shutting_down = SHUTDOWN_INVALID;
 
        set_fixmap(FIX_SHARED_INFO, xen_start_info->shared_info);
 
        HYPERVISOR_shared_info = (shared_info_t *)fix_to_virt(FIX_SHARED_INFO);
 
        memset(empty_zero_page, 0, PAGE_SIZE);
-            
+
        HYPERVISOR_shared_info->arch.pfn_to_mfn_frame_list_list =
                virt_to_mfn(pfn_to_mfn_frame_list_list);
-  
+
        fpp = PAGE_SIZE/sizeof(unsigned long);
        for (i = 0, j = 0, k = -1; i < max_pfn; i += fpp, j++) {
                if ((j % fpp) == 0) {
                        k++;
-                       pfn_to_mfn_frame_list_list[k] = 
+                       pfn_to_mfn_frame_list_list[k] =
                                virt_to_mfn(pfn_to_mfn_frame_list[k]);
                        j = 0;
                }
-               pfn_to_mfn_frame_list[k][j] = 
+               pfn_to_mfn_frame_list[k][j] =
                        virt_to_mfn(&phys_to_machine_mapping[i]);
        }
        HYPERVISOR_shared_info->arch.max_pfn = max_pfn;
@@ -207,7 +208,7 @@
 
 #endif
 
-       /* 
+       /*
         * Only resume xenbus /after/ we've prepared our VCPUs; otherwise
         * the VCPU hotplug callback can race with our vcpu_prepare
         */
@@ -231,7 +232,7 @@
 
 static int shutdown_process(void *__unused)
 {
-       static char *envp[] = { "HOME=/", "TERM=linux", 
+       static char *envp[] = { "HOME=/", "TERM=linux",
                                "PATH=/sbin:/usr/sbin:/bin:/usr/bin", NULL };
        static char *restart_argv[]  = { "/sbin/reboot", NULL };
        static char *poweroff_argv[] = { "/sbin/poweroff", NULL };
@@ -291,7 +292,7 @@
        else
                err = kthread_create_on_cpu(__do_suspend, NULL, "suspend", 0);
 
-       if ( err < 0 ) {
+       if (err < 0) {
                printk(KERN_WARNING "Error creating shutdown process (%d): "
                       "retrying...\n", -err);
                schedule_delayed_work(&shutdown_work, HZ/2);
@@ -406,14 +407,12 @@
        err2 = register_xenbus_watch(&sysrq_watch);
 #endif
 
-       if (err1) {
+       if (err1)
                printk(KERN_ERR "Failed to set shutdown watcher\n");
-       }
-    
+
 #ifdef CONFIG_MAGIC_SYSRQ
-       if (err2) {
+       if (err2)
                printk(KERN_ERR "Failed to set sysrq watcher\n");
-       }
 #endif
 
        return NOTIFY_DONE;
@@ -421,11 +420,11 @@
 
 static int __init setup_shutdown_event(void)
 {
-    
+
        xenstore_notifier.notifier_call = setup_shutdown_watcher;
 
        register_xenstore_notifier(&xenstore_notifier);
-    
+
        return 0;
 }
 
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/drivers/xen/net_driver_util.c
--- a/linux-2.6-xen-sparse/drivers/xen/net_driver_util.c        Mon Mar  6 
17:05:09 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/net_driver_util.c        Mon Mar  6 
17:15:10 2006
@@ -40,9 +40,8 @@
        int i;
        char *e;
        char *macstr = xenbus_read(XBT_NULL, dev->nodename, "mac", NULL);
-       if (IS_ERR(macstr)) {
+       if (IS_ERR(macstr))
                return PTR_ERR(macstr);
-       }
        s = macstr;
        for (i = 0; i < ETH_ALEN; i++) {
                mac[i] = simple_strtoul(s, &e, 16);
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c      Mon Mar  6 
17:05:09 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c      Mon Mar  6 
17:15:10 2006
@@ -91,7 +91,7 @@
 
        struct net_device_stats stats;
        unsigned int tx_full;
-    
+
        netif_tx_front_ring_t tx;
        netif_rx_front_ring_t rx;
 
@@ -129,9 +129,9 @@
        struct sk_buff *rx_skbs[NET_RX_RING_SIZE+1];
 
        grant_ref_t gref_tx_head;
-       grant_ref_t grant_tx_ref[NET_TX_RING_SIZE + 1]; 
+       grant_ref_t grant_tx_ref[NET_TX_RING_SIZE + 1];
        grant_ref_t gref_rx_head;
-       grant_ref_t grant_rx_ref[NET_TX_RING_SIZE + 1]; 
+       grant_ref_t grant_rx_ref[NET_TX_RING_SIZE + 1];
 
        struct xenbus_device *xbdev;
        int tx_ring_ref;
@@ -433,7 +433,7 @@
 
        skb = arp_create(ARPOP_REPLY, ETH_P_ARP,
                         dst_ip, dev, src_ip,
-                        /*dst_hw*/ NULL, /*src_hw*/ NULL, 
+                        /*dst_hw*/ NULL, /*src_hw*/ NULL,
                         /*target_hw*/ dev->dev_addr);
        if (skb == NULL)
                return -ENOMEM;
@@ -480,7 +480,7 @@
                                printk(KERN_ALERT "network_tx_buf_gc: warning "
                                       "-- grant still in use by backend "
                                       "domain.\n");
-                               goto out; 
+                               goto out;
                        }
                        gnttab_end_foreign_access_ref(
                                np->grant_tx_ref[id], GNTMAP_readonly);
@@ -490,9 +490,9 @@
                        ADD_ID_TO_FREELIST(np->tx_skbs, id);
                        dev_kfree_skb_irq(skb);
                }
-        
+
                np->tx.rsp_cons = prod;
-        
+
                /*
                 * Set a new event, then check for race with update of tx_cons.
                 * Note that it is essential to schedule a callback, no matter
@@ -506,7 +506,7 @@
                mb();
        } while (prod != np->tx.sring->rsp_prod);
 
- out: 
+ out:
        if (np->tx_full &&
            ((np->tx.sring->req_prod - prod) < NET_TX_RING_SIZE)) {
                np->tx_full = 0;
@@ -582,7 +582,7 @@
                id = GET_ID_FROM_FREELIST(np->rx_skbs);
 
                np->rx_skbs[id] = skb;
-        
+
                RING_GET_REQUEST(&np->rx, req_prod + i)->id = id;
                ref = gnttab_claim_grant_reference(&np->gref_rx_head);
                BUG_ON((signed short)ref < 0);
@@ -628,11 +628,10 @@
                /* Check return status of HYPERVISOR_memory_op(). */
                if (unlikely(rx_mcl[i].result != i))
                        panic("Unable to reduce memory reservation\n");
-       } else {
+       } else
                if (HYPERVISOR_memory_op(XENMEM_decrease_reservation,
                                         &reservation) != i)
                        panic("Unable to reduce memory reservation\n");
-       }
 
        /* Above is a suitable barrier to ensure backend will see requests. */
        np->rx.req_prod_pvt = req_prod + i;
@@ -668,7 +667,7 @@
                dev_kfree_skb(skb);
                skb = nskb;
        }
-    
+
        spin_lock_irq(&np->tx_lock);
 
        if (np->backend_state != BEST_CONNECTED) {
@@ -765,7 +764,7 @@
        rp = np->rx.sring->rsp_prod;
        rmb(); /* Ensure we see queued responses up to 'rp'. */
 
-       for (i = np->rx.rsp_cons, work_done = 0; 
+       for (i = np->rx.rsp_cons, work_done = 0;
             (i != rp) && (work_done < budget);
             i++, work_done++) {
                rx = RING_GET_RESPONSE(&np->rx, i);
@@ -807,7 +806,7 @@
                skb->len  = rx->status;
                skb->tail = skb->data + skb->len;
 
-               if ( rx->flags & NETRXF_csum_valid )
+               if (rx->flags & NETRXF_csum_valid)
                        skb->ip_summed = CHECKSUM_UNNECESSARY;
 
                np->stats.rx_packets++;
@@ -862,7 +861,7 @@
                 * Enough room in skbuff for the data we were passed? Also,
                 * Linux expects at least 16 bytes headroom in each rx buffer.
                 */
-               if (unlikely(skb->tail > skb->end) || 
+               if (unlikely(skb->tail > skb->end) ||
                    unlikely((skb->data - skb->head) < 16)) {
                        if (net_ratelimit()) {
                                if (skb->tail > skb->end)
@@ -894,7 +893,7 @@
                        if ((skb = nskb) == NULL)
                                continue;
                }
-        
+
                /* Set the shinfo area, which is hidden behind the data. */
                init_skb_shinfo(skb);
                /* Ethernet work: Delayed to here as it peeks the header. */
@@ -995,9 +994,9 @@
 
                tx->id = i;
                gnttab_grant_foreign_access_ref(
-                       np->grant_tx_ref[i], np->xbdev->otherend_id, 
+                       np->grant_tx_ref[i], np->xbdev->otherend_id,
                        virt_to_mfn(np->tx_skbs[i]->data),
-                       GNTMAP_readonly); 
+                       GNTMAP_readonly);
                tx->gref = np->grant_tx_ref[i];
                tx->offset = (unsigned long)skb->data & ~PAGE_MASK;
                tx->size = skb->len;
@@ -1012,7 +1011,7 @@
        RING_PUSH_REQUESTS(&np->tx);
 
        /* Rebuild the RX buffer freelist and the RX ring itself. */
-       for (requeue_idx = 0, i = 1; i <= NET_RX_RING_SIZE; i++) { 
+       for (requeue_idx = 0, i = 1; i <= NET_RX_RING_SIZE; i++) {
                if ((unsigned long)np->rx_skbs[i] < __PAGE_OFFSET)
                        continue;
                gnttab_grant_foreign_transfer_ref(
@@ -1021,7 +1020,7 @@
                RING_GET_REQUEST(&np->rx, requeue_idx)->gref =
                        np->grant_rx_ref[i];
                RING_GET_REQUEST(&np->rx, requeue_idx)->id = i;
-               requeue_idx++; 
+               requeue_idx++;
        }
 
        np->rx.req_prod_pvt = requeue_idx;
@@ -1055,9 +1054,8 @@
                        np->evtchn,
                        np->tx,
                        np->rx);
-       } else {
+       } else
                IPRINTK("<vif NULL>\n");
-       }
 #endif
 }
 
@@ -1150,7 +1148,7 @@
        SET_ETHTOOL_OPS(netdev, &network_ethtool_ops);
        SET_MODULE_OWNER(netdev);
        SET_NETDEV_DEV(netdev, &dev->dev);
-    
+
        if ((err = register_netdev(netdev)) != 0) {
                printk(KERN_WARNING "%s> register_netdev err=%d\n",
                       __FUNCTION__, err);
@@ -1181,16 +1179,16 @@
  * We use this notifier to send out a fake ARP reply to reset switches and
  * router ARP caches when an IP interface is brought up on a VIF.
  */
-static int 
+static int
 inetdev_notify(struct notifier_block *this, unsigned long event, void *ptr)
 {
-       struct in_ifaddr  *ifa = (struct in_ifaddr *)ptr; 
+       struct in_ifaddr  *ifa = (struct in_ifaddr *)ptr;
        struct net_device *dev = ifa->ifa_dev->dev;
 
        /* UP event and is it one of our devices? */
        if (event == NETDEV_UP && dev->open == network_open)
                (void)send_fake_arp(dev);
-        
+
        return NOTIFY_DONE;
 }
 
@@ -1336,8 +1334,8 @@
 module_exit(netif_exit);
 
 MODULE_LICENSE("Dual BSD/GPL");
- 
- 
+
+
 /* ** /proc **/
 
 
@@ -1354,9 +1352,8 @@
                (struct net_device *)((unsigned long)data & ~3UL);
        struct netfront_info *np = netdev_priv(dev);
        int len = 0, which_target = (long)data & 3;
-    
-       switch (which_target)
-       {
+
+       switch (which_target) {
        case TARGET_MIN:
                len = sprintf(page, "%d\n", np->rx_min_target);
                break;
@@ -1403,8 +1400,7 @@
 
        spin_lock(&np->rx_lock);
 
-       switch (which_target)
-       {
+       switch (which_target) {
        case TARGET_MIN:
                if (target > np->rx_max_target)
                        np->rx_max_target = target;
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/drivers/xen/xenbus/Makefile
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/Makefile  Mon Mar  6 17:05:09 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/Makefile  Mon Mar  6 17:15:10 2006
@@ -1,8 +1,8 @@
 obj-y  += xenbus.o
 
 xenbus-objs =
-xenbus-objs += xenbus_client.o 
+xenbus-objs += xenbus_client.o
 xenbus-objs += xenbus_comms.o
 xenbus-objs += xenbus_xs.o
-xenbus-objs += xenbus_probe.o 
-xenbus-objs += xenbus_dev.o 
+xenbus-objs += xenbus_probe.o
+xenbus-objs += xenbus_dev.o
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_client.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_client.c   Mon Mar  6 
17:05:09 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_client.c   Mon Mar  6 
17:15:10 2006
@@ -39,7 +39,7 @@
     pr_debug("xenbus_client (%s:%d) " fmt ".\n", __FUNCTION__, __LINE__, 
##args)
 
 int xenbus_watch_path(struct xenbus_device *dev, const char *path,
-                     struct xenbus_watch *watch, 
+                     struct xenbus_watch *watch,
                      void (*callback)(struct xenbus_watch *,
                                       const char **, unsigned int))
 {
@@ -62,7 +62,7 @@
 
 
 int xenbus_watch_path2(struct xenbus_device *dev, const char *path,
-                      const char *path2, struct xenbus_watch *watch, 
+                      const char *path2, struct xenbus_watch *watch,
                       void (*callback)(struct xenbus_watch *,
                                        const char **, unsigned int))
 {
@@ -74,9 +74,8 @@
        }
        err = xenbus_watch_path(dev, state, watch, callback);
 
-       if (err) {
+       if (err)
                kfree(state);
-       }
        return err;
 }
 EXPORT_SYMBOL(xenbus_watch_path2);
@@ -190,7 +189,7 @@
        va_start(ap, fmt);
        _dev_error(dev, err, fmt, ap);
        va_end(ap);
-       
+
        xenbus_switch_state(dev, XBT_NULL, XenbusStateClosing);
 }
 EXPORT_SYMBOL(xenbus_dev_fatal);
@@ -213,7 +212,6 @@
                .u.alloc_unbound.dom = DOMID_SELF,
                .u.alloc_unbound.remote_dom = dev->otherend_id
        };
-
        int err = HYPERVISOR_event_channel_op(&op);
        if (err)
                xenbus_dev_fatal(dev, err, "allocating event channel");
@@ -231,7 +229,6 @@
                .u.bind_interdomain.remote_dom = dev->otherend_id,
                .u.bind_interdomain.remote_port = remote_port,
        };
-
        int err = HYPERVISOR_event_channel_op(&op);
        if (err)
                xenbus_dev_fatal(dev, err,
@@ -388,7 +385,6 @@
 XenbusState xenbus_read_driver_state(const char *path)
 {
        XenbusState result;
-
        int err = xenbus_gather(XBT_NULL, path, "state", "%d", &result, NULL);
        if (err)
                result = XenbusStateClosed;
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_comms.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_comms.c    Mon Mar  6 
17:05:09 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_comms.c    Mon Mar  6 
17:15:10 2006
@@ -38,8 +38,8 @@
 
 static int xenbus_irq;
 
-extern void xenbus_probe(void *); 
-extern int xenstored_ready; 
+extern void xenbus_probe(void *);
+extern int xenstored_ready;
 static DECLARE_WORK(probe_work, xenbus_probe, NULL);
 
 DECLARE_WAIT_QUEUE_HEAD(xb_waitq);
@@ -52,9 +52,9 @@
 static irqreturn_t wake_waiting(int irq, void *unused, struct pt_regs *regs)
 {
        if (unlikely(xenstored_ready == 0)) {
-               xenstored_ready = 1; 
-               schedule_work(&probe_work); 
-       } 
+               xenstored_ready = 1;
+               schedule_work(&probe_work);
+       }
 
        wake_up(&xb_waitq);
        return IRQ_HANDLED;
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c    Mon Mar  6 
17:05:09 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c    Mon Mar  6 
17:15:10 2006
@@ -366,7 +366,6 @@
        xenbus_dev_error(dev, err, "xenbus_dev_probe on %s", dev->nodename);
        xenbus_switch_state(dev, XBT_NULL, XenbusStateClosed);
        return -ENODEV;
-       
 }
 
 static int xenbus_dev_remove(struct device *_dev)
@@ -495,9 +494,8 @@
 
 static void xenbus_dev_release(struct device *dev)
 {
-       if (dev) {
+       if (dev)
                xenbus_dev_free(to_xenbus_device(dev));
-       }
 }
 
 /* Simplified asprintf. */
@@ -600,7 +598,7 @@
        nodename = kasprintf("%s/%s/%s", xenbus_frontend.root, type, name);
        if (!nodename)
                return -ENOMEM;
-       
+
        DPRINTK("%s", nodename);
 
        err = xenbus_probe_node(&xenbus_frontend, type, nodename);
@@ -972,6 +970,7 @@
                         int count, int *eof, void *data)
 {
        int len;
+
        len  = sprintf(page, "0x%p", mfn_to_virt(xen_start_info->store_mfn));
        *eof = 1;
        return len;
@@ -1006,8 +1005,8 @@
        device_register(&xenbus_backend.dev);
 
        /*
-       ** Domain0 doesn't have a store_evtchn or store_mfn yet.
-       */
+        * Domain0 doesn't have a store_evtchn or store_mfn yet.
+        */
        dom0 = (xen_start_info->store_evtchn == 0);
 
        if (dom0) {
@@ -1029,7 +1028,7 @@
                xen_start_info->store_mfn =
                        pfn_to_mfn(virt_to_phys((void *)page) >>
                                   PAGE_SHIFT);
-               
+
                /* Next allocate a local port which xenstored can bind to */
                op.cmd = EVTCHNOP_alloc_unbound;
                op.u.alloc_unbound.dom        = DOMID_SELF;
@@ -1040,14 +1039,16 @@
                xen_start_info->store_evtchn = op.u.alloc_unbound.port;
 
                /* And finally publish the above info in /proc/xen */
-               if ((xsd_kva_intf = create_xen_proc_entry("xsd_kva", 0400))) {
+               xsd_kva_intf = create_xen_proc_entry("xsd_kva", 0400);
+               if (xsd_kva_intf) {
                        memcpy(&xsd_kva_fops, xsd_kva_intf->proc_fops,
                               sizeof(xsd_kva_fops));
                        xsd_kva_fops.mmap = xsd_kva_mmap;
                        xsd_kva_intf->proc_fops = &xsd_kva_fops;
                        xsd_kva_intf->read_proc = xsd_kva_read;
                }
-               if ((xsd_port_intf = create_xen_proc_entry("xsd_port", 0400)))
+               xsd_port_intf = create_xen_proc_entry("xsd_port", 0400);
+               if (xsd_port_intf)
                        xsd_port_intf->read_proc = xsd_port_read;
        }
 
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c       Mon Mar  6 
17:05:09 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c       Mon Mar  6 
17:15:10 2006
@@ -176,9 +176,8 @@
        if (err) {
                msg->type = XS_ERROR;
                ret = ERR_PTR(err);
-       } else {
+       } else
                ret = read_reply(&msg->type, &msg->len);
-       }
 
        up(&xs_state.request_mutex);
 
@@ -275,7 +274,7 @@
        return num;
 }
 
-/* Return the path to dir with /name appended. Buffer must be kfree()'ed. */ 
+/* Return the path to dir with /name appended. Buffer must be kfree()'ed. */
 static char *join(const char *dir, const char *name)
 {
        char *buffer;
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h Mon Mar  6 
17:05:09 2006
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h Mon Mar  6 
17:15:10 2006
@@ -71,7 +71,8 @@
 {
        if (xen_feature(XENFEAT_auto_translated_physmap))
                return pfn;
-       return phys_to_machine_mapping[(unsigned int)(pfn)] & 
~FOREIGN_FRAME_BIT;
+       return phys_to_machine_mapping[(unsigned int)(pfn)] &
+               ~FOREIGN_FRAME_BIT;
 }
 
 static inline int phys_to_machine_mapping_valid(unsigned long pfn)
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/pgtable-3level.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/pgtable-3level.h       
Mon Mar  6 17:05:09 2006
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/pgtable-3level.h       
Mon Mar  6 17:15:10 2006
@@ -131,8 +131,8 @@
        return !pte.pte_low && !pte.pte_high;
 }
 
-#define pte_mfn(_pte) ( ((_pte).pte_low >> PAGE_SHIFT) |\
-                       (((_pte).pte_high & 0xfff) << (32-PAGE_SHIFT)) )
+#define pte_mfn(_pte) (((_pte).pte_low >> PAGE_SHIFT) |\
+                      (((_pte).pte_high & 0xfff) << (32-PAGE_SHIFT)))
 #define pte_pfn(_pte) mfn_to_local_pfn(pte_mfn(_pte))
 
 extern unsigned long long __supported_pte_mask;
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h       Mon Mar 
 6 17:05:09 2006
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h       Mon Mar 
 6 17:15:10 2006
@@ -596,7 +596,7 @@
        _vcpu = &HYPERVISOR_shared_info->vcpu_info[__vcpu_id];          \
        _vcpu->evtchn_upcall_mask = 0;                                  \
        barrier(); /* unmask then check (avoid races) */                \
-       if ( unlikely(_vcpu->evtchn_upcall_pending) )                   \
+       if (unlikely(_vcpu->evtchn_upcall_pending))                     \
                force_evtchn_callback();                                \
        preempt_enable();                                               \
 } while (0)
@@ -618,7 +618,7 @@
        _vcpu = &HYPERVISOR_shared_info->vcpu_info[__vcpu_id];          \
        if ((_vcpu->evtchn_upcall_mask = (x)) == 0) {                   \
                barrier(); /* unmask then check (avoid races) */        \
-               if ( unlikely(_vcpu->evtchn_upcall_pending) )           \
+               if (unlikely(_vcpu->evtchn_upcall_pending))             \
                        force_evtchn_callback();                        \
                preempt_enable();                                       \
        } else                                                          \
diff -r 085f0ad9018a -r e9daf5307296 
linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/page.h
--- a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/page.h       Mon Mar 
 6 17:05:09 2006
+++ b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/page.h       Mon Mar 
 6 17:15:10 2006
@@ -89,7 +89,8 @@
 {
        if (xen_feature(XENFEAT_auto_translated_physmap))
                return pfn;
-       return phys_to_machine_mapping[(unsigned int)(pfn)] & 
~FOREIGN_FRAME_BIT;
+       return phys_to_machine_mapping[(unsigned int)(pfn)] &
+               ~FOREIGN_FRAME_BIT;
 }
 
 static inline int phys_to_machine_mapping_valid(unsigned long pfn)
diff -r 085f0ad9018a -r e9daf5307296 linux-2.6-xen-sparse/include/linux/mm.h
--- a/linux-2.6-xen-sparse/include/linux/mm.h   Mon Mar  6 17:05:09 2006
+++ b/linux-2.6-xen-sparse/include/linux/mm.h   Mon Mar  6 17:15:10 2006
@@ -1020,9 +1020,9 @@
 #define FOLL_ANON      0x08    /* give ZERO_PAGE if no pgtable */
 
 #ifdef CONFIG_XEN
-typedef int (*pte_fn_t)(pte_t *pte, struct page *pte_page, unsigned long addr, 
+typedef int (*pte_fn_t)(pte_t *pte, struct page *pte_page, unsigned long addr,
                         void *data);
-extern int generic_page_range(struct mm_struct *mm, unsigned long address, 
+extern int generic_page_range(struct mm_struct *mm, unsigned long address,
                               unsigned long size, pte_fn_t fn, void *data);
 #endif
 
diff -r 085f0ad9018a -r e9daf5307296 linux-2.6-xen-sparse/include/xen/xenbus.h
--- a/linux-2.6-xen-sparse/include/xen/xenbus.h Mon Mar  6 17:05:09 2006
+++ b/linux-2.6-xen-sparse/include/xen/xenbus.h Mon Mar  6 17:15:10 2006
@@ -28,8 +28,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef _ASM_XEN_XENBUS_H
-#define _ASM_XEN_XENBUS_H
+#ifndef _XEN_XENBUS_H
+#define _XEN_XENBUS_H
 
 #include <linux/device.h>
 #include <linux/notifier.h>
@@ -170,7 +170,7 @@
  * be saved in the store.
  */
 int xenbus_watch_path(struct xenbus_device *dev, const char *path,
-                     struct xenbus_watch *watch, 
+                     struct xenbus_watch *watch,
                      void (*callback)(struct xenbus_watch *,
                                       const char **, unsigned int));
 
@@ -185,7 +185,7 @@
  * saved in the store.
  */
 int xenbus_watch_path2(struct xenbus_device *dev, const char *path,
-                      const char *path2, struct xenbus_watch *watch, 
+                      const char *path2, struct xenbus_watch *watch,
                       void (*callback)(struct xenbus_watch *,
                                        const char **, unsigned int));
 
@@ -216,8 +216,8 @@
  * page to that address, and sets *vaddr to that address.
  * xenbus_map_ring does not allocate the virtual address space (you must do
  * this yourself!). It only maps in the page to the specified address.
- * Returns 0 on success, and GNTST_* (see xen/include/public/grant_table.h) or
- * -ENOMEM on error. If an error is returned, device will switch to
+ * Returns 0 on success, and GNTST_* (see xen/include/interface/grant_table.h)
+ * or -ENOMEM on error. If an error is returned, device will switch to
  * XenbusStateClosing and the error message will be saved in XenStore.
  */
 int xenbus_map_ring_valloc(struct xenbus_device *dev,
@@ -231,7 +231,7 @@
  * Use xenbus_unmap_ring_vfree if you mapped in your memory with
  * xenbus_map_ring_valloc (it will free the virtual address space).
  * Returns 0 on success and returns GNTST_* on error
- * (see xen/include/public/grant_table.h).
+ * (see xen/include/interface/grant_table.h).
  */
 int xenbus_unmap_ring_vfree(struct xenbus_device *dev, void *vaddr);
 int xenbus_unmap_ring(struct xenbus_device *dev,
@@ -285,7 +285,7 @@
                      ...);
 
 
-#endif /* _ASM_XEN_XENBUS_H */
+#endif /* _XEN_XENBUS_H */
 
 /*
  * Local variables:
diff -r 085f0ad9018a -r e9daf5307296 xen/include/public/acm.h
--- a/xen/include/public/acm.h  Mon Mar  6 17:05:09 2006
+++ b/xen/include/public/acm.h  Mon Mar  6 17:15:10 2006
@@ -152,7 +152,7 @@
     uint32_t ec_eval_count;
     uint32_t gt_eval_count;
     uint32_t ec_denied_count;
-    uint32_t gt_denied_count; 
+    uint32_t gt_denied_count;
     uint32_t ec_cachehit_count;
     uint32_t gt_cachehit_count;
 };
diff -r 085f0ad9018a -r e9daf5307296 xen/include/public/arch-ia64.h
--- a/xen/include/public/arch-ia64.h    Mon Mar  6 17:05:09 2006
+++ b/xen/include/public/arch-ia64.h    Mon Mar  6 17:15:10 2006
@@ -60,8 +60,8 @@
 
 #define INVALID_MFN       (~0UL)
 
-#define MEM_G   (1UL << 30)    
-#define MEM_M   (1UL << 20)    
+#define MEM_G   (1UL << 30)
+#define MEM_M   (1UL << 20)
 
 #define MMIO_START       (3 * MEM_G)
 #define MMIO_SIZE        (512 * MEM_M)
@@ -70,7 +70,7 @@
 #define VGA_IO_SIZE      0x20000
 
 #define LEGACY_IO_START  (MMIO_START + MMIO_SIZE)
-#define LEGACY_IO_SIZE   (64*MEM_M)  
+#define LEGACY_IO_SIZE   (64*MEM_M)
 
 #define IO_PAGE_START (LEGACY_IO_START + LEGACY_IO_SIZE)
 #define IO_PAGE_SIZE  PAGE_SIZE
@@ -82,7 +82,7 @@
 #define IO_SAPIC_SIZE    0x100000
 
 #define PIB_START 0xfee00000UL
-#define PIB_SIZE 0x100000 
+#define PIB_SIZE 0x100000
 
 #define GFW_START        (4*MEM_G -16*MEM_M)
 #define GFW_SIZE         (16*MEM_M)
@@ -300,7 +300,7 @@
 
 typedef struct {
     unsigned long start;
-    unsigned long size; 
+    unsigned long size;
 } arch_initrd_info_t;
 
 #define IA64_COMMAND_LINE_SIZE 512
diff -r 085f0ad9018a -r e9daf5307296 xen/include/public/arch-x86_32.h
--- a/xen/include/public/arch-x86_32.h  Mon Mar  6 17:05:09 2006
+++ b/xen/include/public/arch-x86_32.h  Mon Mar  6 17:15:10 2006
@@ -157,7 +157,7 @@
 typedef struct arch_shared_info {
     unsigned long max_pfn;                  /* max pfn that appears in table */
     /* Frame containing list of mfns containing list of mfns containing p2m. */
-    unsigned long pfn_to_mfn_frame_list_list; 
+    unsigned long pfn_to_mfn_frame_list_list;
     unsigned long nmi_reason;
 } arch_shared_info_t;
 
diff -r 085f0ad9018a -r e9daf5307296 xen/include/public/arch-x86_64.h
--- a/xen/include/public/arch-x86_64.h  Mon Mar  6 17:05:09 2006
+++ b/xen/include/public/arch-x86_64.h  Mon Mar  6 17:15:10 2006
@@ -242,7 +242,7 @@
 typedef struct arch_shared_info {
     unsigned long max_pfn;                  /* max pfn that appears in table */
     /* Frame containing list of mfns containing list of mfns containing p2m. */
-    unsigned long pfn_to_mfn_frame_list_list; 
+    unsigned long pfn_to_mfn_frame_list_list;
     unsigned long nmi_reason;
 } arch_shared_info_t;
 
diff -r 085f0ad9018a -r e9daf5307296 xen/include/public/dom0_ops.h
--- a/xen/include/public/dom0_ops.h     Mon Mar  6 17:05:09 2006
+++ b/xen/include/public/dom0_ops.h     Mon Mar  6 17:15:10 2006
@@ -173,7 +173,7 @@
 } dom0_readconsole_t;
 DEFINE_GUEST_HANDLE(dom0_readconsole_t);
 
-/* 
+/*
  * Set which physical cpus a vcpu can execute on.
  */
 #define DOM0_SETVCPUAFFINITY  20
@@ -231,7 +231,7 @@
 } dom0_sched_id_t;
 DEFINE_GUEST_HANDLE(dom0_sched_id_t);
 
-/* 
+/*
  * Control shadow pagetables operation
  */
 #define DOM0_SHADOW_CONTROL  25
@@ -248,8 +248,8 @@
 typedef struct dom0_shadow_control_stats {
     uint32_t fault_count;
     uint32_t dirty_count;
-    uint32_t dirty_net_count;     
-    uint32_t dirty_block_count;     
+    uint32_t dirty_net_count;
+    uint32_t dirty_block_count;
 } dom0_shadow_control_stats_t;
 DEFINE_GUEST_HANDLE(dom0_shadow_control_stats_t);
 
@@ -402,7 +402,7 @@
 } dom0_getdomaininfolist_t;
 DEFINE_GUEST_HANDLE(dom0_getdomaininfolist_t);
 
-#define DOM0_PLATFORM_QUIRK      39  
+#define DOM0_PLATFORM_QUIRK      39
 #define QUIRK_NOIRQBALANCING  1
 typedef struct dom0_platform_quirk {
     /* IN variables. */
@@ -463,14 +463,14 @@
     uint8_t allow_access;     /* allow (!0) or deny (0) access to range? */
 } dom0_iomem_permission_t;
 DEFINE_GUEST_HANDLE(dom0_iomem_permission_t);
- 
+
 #define DOM0_HYPERCALL_INIT   48
 typedef struct dom0_hypercall_init {
     domid_t  domain;          /* domain to be affected */
     unsigned long mfn;        /* machine frame to be initialised */
 } dom0_hypercall_init_t;
 DEFINE_GUEST_HANDLE(dom0_hypercall_init_t);
- 
+
 typedef struct dom0_op {
     uint32_t cmd;
     uint32_t interface_version; /* DOM0_INTERFACE_VERSION */
@@ -507,7 +507,7 @@
         struct dom0_platform_quirk    platform_quirk;
         struct dom0_physical_memory_map physical_memory_map;
         struct dom0_max_vcpus         max_vcpus;
-        struct dom0_setdomainhandle   setdomainhandle;        
+        struct dom0_setdomainhandle   setdomainhandle;
         struct dom0_setdebugging      setdebugging;
         struct dom0_irq_permission    irq_permission;
         struct dom0_iomem_permission  iomem_permission;
diff -r 085f0ad9018a -r e9daf5307296 xen/include/public/grant_table.h
--- a/xen/include/public/grant_table.h  Mon Mar  6 17:05:09 2006
+++ b/xen/include/public/grant_table.h  Mon Mar  6 17:15:10 2006
@@ -262,7 +262,7 @@
   * GNTMAP_contains_pte subflag:
   *  0 => This map request contains a host virtual address.
   *  1 => This map request contains the machine addess of the PTE to update.
-  */ 
+  */
 #define _GNTMAP_contains_pte    (4)
 #define GNTMAP_contains_pte     (1<<_GNTMAP_contains_pte)
 
diff -r 085f0ad9018a -r e9daf5307296 xen/include/public/hvm/vmx_assist.h
--- a/xen/include/public/hvm/vmx_assist.h       Mon Mar  6 17:05:09 2006
+++ b/xen/include/public/hvm/vmx_assist.h       Mon Mar  6 17:15:10 2006
@@ -22,13 +22,13 @@
         unsigned int seg_type : 4,
             s         : 1,
             dpl       : 2,
-            p         : 1, 
+            p         : 1,
             reserved0 : 4,
             avl       : 1,
-            reserved1 : 1,     
+            reserved1 : 1,
             default_ops_size: 1,
             g         : 1,
-            null_bit  : 1, 
+            null_bit  : 1,
             reserved2 : 15;
     } fields;
     unsigned int bytes;
diff -r 085f0ad9018a -r e9daf5307296 xen/include/public/io/ring.h
--- a/xen/include/public/io/ring.h      Mon Mar  6 17:05:09 2006
+++ b/xen/include/public/io/ring.h      Mon Mar  6 17:15:10 2006
@@ -39,7 +39,7 @@
  *
  * These expand out to give you a set of types, as you can see below.
  * The most important of these are:
- *  
+ * 
  *     mytag_sring_t      - The shared ring.
  *     mytag_front_ring_t - The 'front' half of the ring.
  *     mytag_back_ring_t  - The 'back' half of the ring.
@@ -58,7 +58,7 @@
  *     mytag_back_ring_t back_ring;
  *     BACK_RING_INIT(&back_ring, (mytag_sring_t *)shared_page, PAGE_SIZE);
  */
-         
+
 #define DEFINE_RING_TYPES(__name, __req_t, __rsp_t)                     \
                                                                         \
 /* Shared ring entry */                                                 \
@@ -97,7 +97,7 @@
 typedef struct __name##_back_ring __name##_back_ring_t
 
 /*
- * Macros for manipulating rings.  
+ * Macros for manipulating rings.
  * 
  * FRONT_RING_whatever works on the "front end" of a ring: here 
  * requests are pushed on to the ring and responses taken off it.
@@ -105,7 +105,7 @@
  * BACK_RING_whatever works on the "back end" of a ring: here 
  * requests are taken off the ring and responses put on.
  * 
- * N.B. these macros do NO INTERLOCKS OR FLOW CONTROL.  
+ * N.B. these macros do NO INTERLOCKS OR FLOW CONTROL. 
  * This is OK in 1-for-1 request-response situations where the 
  * requestor (front end) never has more than RING_SIZE()-1
  * outstanding requests.
@@ -151,7 +151,7 @@
 #define RING_SIZE(_r)                                                   \
     ((_r)->nr_ents)
 
-/* Test if there is an empty slot available on the front ring. 
+/* Test if there is an empty slot available on the front ring.
  * (This is only meaningful from the front. )
  */
 #define RING_FULL(_r)                                                   \
@@ -159,24 +159,19 @@
 
 /* Test if there are outstanding messages to be processed on a ring. */
 #define RING_HAS_UNCONSUMED_RESPONSES(_r)                               \
-   ( (_r)->rsp_cons != (_r)->sring->rsp_prod )
-   
+    ((_r)->rsp_cons != (_r)->sring->rsp_prod)
+
 #define RING_HAS_UNCONSUMED_REQUESTS(_r)                                \
-   ( ((_r)->req_cons != (_r)->sring->req_prod ) &&                      \
-     (((_r)->req_cons - (_r)->rsp_prod_pvt) !=                          \
-      RING_SIZE(_r)) )
-      
+    (((_r)->req_cons != (_r)->sring->req_prod) &&                       \
+     (((_r)->req_cons - (_r)->rsp_prod_pvt) != RING_SIZE(_r)))
+
 /* Direct access to individual ring elements, by index. */
 #define RING_GET_REQUEST(_r, _idx)                                      \
- (&((_r)->sring->ring[                                                  \
-     ((_idx) & (RING_SIZE(_r) - 1))                                     \
-     ].req))
+    (&((_r)->sring->ring[((_idx) & (RING_SIZE(_r) - 1))].req))
 
 #define RING_GET_RESPONSE(_r, _idx)                                     \
- (&((_r)->sring->ring[                                                  \
-     ((_idx) & (RING_SIZE(_r) - 1))                                     \
-     ].rsp))   
-    
+    (&((_r)->sring->ring[((_idx) & (RING_SIZE(_r) - 1))].rsp))
+
 /* Loop termination condition: Would the specified index overflow the ring? */
 #define RING_REQUEST_CONS_OVERFLOW(_r, _cons)                           \
     (((_cons) - (_r)->rsp_prod_pvt) >= RING_SIZE(_r))
@@ -212,7 +207,7 @@
  *  The second argument is a boolean return value. True indicates that there
  *  are pending messages on the ring (i.e., the connection should not be put
  *  to sleep).
- *  
+ * 
  *  These macros will set the req_event/rsp_event field to trigger a
  *  notification on the very next message that is enqueued. If you want to
  *  create batches of work (i.e., only receive a notification after several
diff -r 085f0ad9018a -r e9daf5307296 xen/include/public/io/xenbus.h
--- a/xen/include/public/io/xenbus.h    Mon Mar  6 17:05:09 2006
+++ b/xen/include/public/io/xenbus.h    Mon Mar  6 17:15:10 2006
@@ -6,9 +6,8 @@
  * Copyright (C) 2005 XenSource Ltd.
  */
 
-#ifndef _XEN_XENBUS_H
-#define _XEN_XENBUS_H
-
+#ifndef _XEN_PUBLIC_IO_XENBUS_H
+#define _XEN_PUBLIC_IO_XENBUS_H
 
 /* The state of either end of the Xenbus, i.e. the current communication
    status of initialisation across the bus.  States here imply nothing about
@@ -30,8 +29,7 @@
 
 } XenbusState;
 
-
-#endif /* _XEN_XENBUS_H */
+#endif /* _XEN_PUBLIC_IO_XENBUS_H */
 
 /*
  * Local variables:
diff -r 085f0ad9018a -r e9daf5307296 xen/include/public/memory.h
--- a/xen/include/public/memory.h       Mon Mar  6 17:05:09 2006
+++ b/xen/include/public/memory.h       Mon Mar  6 17:15:10 2006
@@ -80,7 +80,7 @@
      * machphys table is smaller than max_extents * 2MB.
      */
     unsigned int max_extents;
-    
+
     /*
      * Pointer to buffer to fill with list of extent starts. If there are
      * any large discontiguities in the machine address space, 2MB gaps in
diff -r 085f0ad9018a -r e9daf5307296 xen/include/public/physdev.h
--- a/xen/include/public/physdev.h      Mon Mar  6 17:05:09 2006
+++ b/xen/include/public/physdev.h      Mon Mar  6 17:15:10 2006
@@ -37,14 +37,14 @@
     uint32_t reg;
     /* IN or OUT */
     uint32_t value;
-} physdevop_apic_t; 
+} physdevop_apic_t;
 
 typedef struct physdevop_irq {
     /* IN */
     uint32_t irq;
     /* OUT */
     uint32_t vector;
-} physdevop_irq_t; 
+} physdevop_irq_t;
 
 typedef struct physdev_op {
     uint32_t cmd;
diff -r 085f0ad9018a -r e9daf5307296 xen/include/public/sched_ctl.h
--- a/xen/include/public/sched_ctl.h    Mon Mar  6 17:05:09 2006
+++ b/xen/include/public/sched_ctl.h    Mon Mar  6 17:15:10 2006
@@ -34,24 +34,20 @@
     uint32_t direction;
     domid_t  domain;
     union {
-        struct bvt_adjdom
-        {
+        struct bvt_adjdom {
             uint32_t mcu_adv;      /* mcu advance: inverse of weight */
             uint32_t warpback;     /* warp? */
             int32_t  warpvalue;    /* warp value */
             int64_t  warpl;        /* warp limit */
             int64_t  warpu;        /* unwarp time requirement */
         } bvt;
-        
-        struct sedf_adjdom
-        {
+        struct sedf_adjdom {
             uint64_t period;
             uint64_t slice;
             uint64_t latency;
             uint32_t extratime;
             uint32_t weight;
         } sedf;
-
     } u;
 };
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] Cleanup whitespace., Xen patchbot -unstable <=