ia64/xen-unstable

changeset 11156:88e6bd5e2b54

Whitespace clean-ups.

Signed-off-by: Steven Hand <steven@xensource.com>
author shand@kneesaa.uk.xensource.com
date Wed Aug 16 11:36:13 2006 +0100 (2006-08-16)
parents ec03b24a2d83
children 7ed73735fd30
files linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c linux-2.6-xen-sparse/drivers/xen/blkback/common.h linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c linux-2.6-xen-sparse/drivers/xen/blktap/common.h linux-2.6-xen-sparse/drivers/xen/blktap/xenbus.c linux-2.6-xen-sparse/drivers/xen/netback/common.h linux-2.6-xen-sparse/drivers/xen/netback/netback.c linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c xen/acm/acm_core.c xen/acm/acm_simple_type_enforcement_hooks.c xen/arch/x86/acpi/boot.c xen/arch/x86/audit.c xen/arch/x86/cpu/amd.c xen/arch/x86/cpu/cyrix.c xen/arch/x86/cpu/transmeta.c xen/arch/x86/dmi_scan.c xen/arch/x86/dom0_ops.c xen/arch/x86/domain_build.c xen/arch/x86/genapic/bigsmp.c xen/arch/x86/genapic/es7000.h xen/arch/x86/genapic/probe.c xen/arch/x86/hvm/svm/svm.c xen/arch/x86/hvm/svm/vmcb.c xen/arch/x86/io_apic.c xen/arch/x86/microcode.c xen/arch/x86/mm.c xen/arch/x86/mpparse.c xen/arch/x86/oprofile/nmi_int.c xen/arch/x86/oprofile/op_model_p4.c xen/arch/x86/oprofile/xenoprof.c xen/arch/x86/setup.c xen/arch/x86/shadow.c xen/arch/x86/shadow32.c xen/arch/x86/shadow_public.c xen/arch/x86/traps.c xen/arch/x86/x86_64/mm.c xen/arch/x86/x86_64/traps.c xen/common/dom0_ops.c xen/common/domain.c xen/common/keyhandler.c xen/common/sched_bvt.c xen/common/sched_sedf.c xen/common/schedule.c xen/common/timer.c xen/include/acm/acm_core.h xen/include/asm-x86/acpi.h xen/include/asm-x86/genapic.h xen/include/asm-x86/hvm/hvm.h xen/include/asm-x86/hvm/svm/vmcb.h xen/include/asm-x86/hvm/vmx/vmcs.h xen/include/asm-x86/mach-es7000/mach_mpparse.h xen/include/asm-x86/mach-generic/mach_mpparse.h xen/include/asm-x86/msr.h xen/include/asm-x86/processor.h xen/include/asm-x86/shadow.h xen/include/asm-x86/shadow_64.h xen/include/asm-x86/string.h xen/include/asm-x86/uaccess.h xen/include/xen/gdbstub.h xen/include/xen/keyhandler.h xen/include/xen/list.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Tue Aug 15 19:53:55 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Wed Aug 16 11:36:13 2006 +0100
     1.3 @@ -76,7 +76,7 @@ static unsigned long current_pages;
     1.4  static unsigned long target_pages;
     1.5  
     1.6  /* We increase/decrease in batches which fit in a page */
     1.7 -static unsigned long frame_list[PAGE_SIZE / sizeof(unsigned long)]; 
     1.8 +static unsigned long frame_list[PAGE_SIZE / sizeof(unsigned long)];
     1.9  
    1.10  /* VM /proc information for memory */
    1.11  extern unsigned long totalram_pages;
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Tue Aug 15 19:53:55 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Wed Aug 16 11:36:13 2006 +0100
     2.3 @@ -341,7 +341,7 @@ static void dispatch_rw_block_io(blkif_t
     2.4  				 blkif_request_t *req,
     2.5  				 pending_req_t *pending_req)
     2.6  {
     2.7 -	extern void ll_rw_block(int rw, int nr, struct buffer_head * bhs[]); 
     2.8 +	extern void ll_rw_block(int rw, int nr, struct buffer_head * bhs[]);
     2.9  	int operation = (req->operation == BLKIF_OP_WRITE) ? WRITE : READ;
    2.10  	struct gnttab_map_grant_ref map[BLKIF_MAX_SEGMENTS_PER_REQUEST];
    2.11  	struct phys_req preq;
    2.12 @@ -409,7 +409,7 @@ static void dispatch_rw_block_io(blkif_t
    2.13  		DPRINTK("access denied: %s of [%llu,%llu] on dev=%04x\n", 
    2.14  			operation == READ ? "read" : "write",
    2.15  			preq.sector_number,
    2.16 -			preq.sector_number + preq.nr_sects, preq.dev); 
    2.17 +			preq.sector_number + preq.nr_sects, preq.dev);
    2.18  		goto fail_flush;
    2.19  	}
    2.20  
     3.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/common.h	Tue Aug 15 19:53:55 2006 +0100
     3.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/common.h	Wed Aug 16 11:36:13 2006 +0100
     3.3 @@ -55,9 +55,9 @@ struct vbd {
     3.4  	unsigned char  type;        /* VDISK_xxx */
     3.5  	u32            pdevice;     /* phys device that this vbd maps to */
     3.6  	struct block_device *bdev;
     3.7 -}; 
     3.8 +};
     3.9  
    3.10 -struct backend_info; 
    3.11 +struct backend_info;
    3.12  
    3.13  typedef struct blkif_st {
    3.14  	/* Unique identifier for this interface. */
    3.15 @@ -72,7 +72,7 @@ typedef struct blkif_st {
    3.16  	/* The VBD attached to this interface. */
    3.17  	struct vbd        vbd;
    3.18  	/* Back pointer to the backend_info. */
    3.19 -	struct backend_info *be; 
    3.20 +	struct backend_info *be;
    3.21  	/* Private fields. */
    3.22  	spinlock_t       blk_ring_lock;
    3.23  	atomic_t         refcnt;
    3.24 @@ -122,7 +122,7 @@ struct phys_req {
    3.25  	blkif_sector_t       sector_number;
    3.26  };
    3.27  
    3.28 -int vbd_translate(struct phys_req *req, blkif_t *blkif, int operation); 
    3.29 +int vbd_translate(struct phys_req *req, blkif_t *blkif, int operation);
    3.30  
    3.31  void blkif_interface_init(void);
    3.32  
     4.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c	Tue Aug 15 19:53:55 2006 +0100
     4.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c	Wed Aug 16 11:36:13 2006 +0100
     4.3 @@ -194,7 +194,7 @@ static int blkback_probe(struct xenbus_d
     4.4  	}
     4.5  
     4.6  	/* setup back pointer */
     4.7 -	be->blkif->be = be; 
     4.8 +	be->blkif->be = be;
     4.9  
    4.10  	err = xenbus_watch_path2(dev, dev->nodename, "physical-device",
    4.11  				 &be->backend_watch, backend_changed);
    4.12 @@ -287,7 +287,7 @@ static void backend_changed(struct xenbu
    4.13  		}
    4.14  
    4.15  		/* We're potentially connected now */
    4.16 -		update_blkif_status(be->blkif); 
    4.17 +		update_blkif_status(be->blkif);
    4.18  	}
    4.19  }
    4.20  
     5.1 --- a/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c	Tue Aug 15 19:53:55 2006 +0100
     5.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c	Wed Aug 16 11:36:13 2006 +0100
     5.3 @@ -157,7 +157,7 @@ static int alloc_pending_reqs;
     5.4  typedef unsigned int PEND_RING_IDX;
     5.5  
     5.6  static inline int MASK_PEND_IDX(int i) { 
     5.7 -	return (i & (MAX_PENDING_REQS-1)); 
     5.8 +	return (i & (MAX_PENDING_REQS-1));
     5.9  }
    5.10  
    5.11  static inline unsigned int RTN_PEND_IDX(pending_req_t *req, int idx) {
    5.12 @@ -754,7 +754,7 @@ static int req_increase(void)
    5.13  	if (!pending_reqs[mmap_alloc] || !pending_addrs[mmap_alloc]) {
    5.14  		kfree(pending_reqs[mmap_alloc]);
    5.15  		kfree(pending_addrs[mmap_alloc]);
    5.16 -		WPRINTK("%s: out of memory\n", __FUNCTION__); 
    5.17 +		WPRINTK("%s: out of memory\n", __FUNCTION__);
    5.18  		ret = -ENOMEM;
    5.19  		goto done;
    5.20  	}
    5.21 @@ -1051,7 +1051,7 @@ static int blktap_read_ufe_ring(int idx)
    5.22  			unsigned long kvaddr, uvaddr;
    5.23  			struct page **map = info->vma->vm_private_data;
    5.24  			struct page *pg;
    5.25 -			int offset; 
    5.26 +			int offset;
    5.27  
    5.28  			uvaddr  = MMAP_VADDR(info->user_vstart, usr_idx, j);
    5.29  			kvaddr = MMAP_VADDR(mmap_start[mmap_idx].start, 
    5.30 @@ -1063,7 +1063,7 @@ static int blktap_read_ufe_ring(int idx)
    5.31  				>> PAGE_SHIFT;
    5.32  			map[offset] = NULL;
    5.33  		}
    5.34 -		fast_flush_area(pending_req, pending_idx, usr_idx, idx); 
    5.35 +		fast_flush_area(pending_req, pending_idx, usr_idx, idx);
    5.36  		make_response(blkif, pending_req->id, resp->operation,
    5.37  			      resp->status);
    5.38  		info->idx_map[usr_idx] = INVALID_REQ;
    5.39 @@ -1118,7 +1118,7 @@ static int do_block_io_op(blkif_t *blkif
    5.40  			       "ring does not exist!\n");
    5.41  			print_dbug = 0; /*We only print this message once*/
    5.42  		}
    5.43 -		return 1; 
    5.44 +		return 1;
    5.45  	}
    5.46  
    5.47  	info = tapfds[blkif->dev_num];
    5.48 @@ -1185,7 +1185,7 @@ static void dispatch_rw_block_io(blkif_t
    5.49  				 blkif_request_t *req,
    5.50  				 pending_req_t *pending_req)
    5.51  {
    5.52 -	extern void ll_rw_block(int rw, int nr, struct buffer_head * bhs[]); 
    5.53 +	extern void ll_rw_block(int rw, int nr, struct buffer_head * bhs[]);
    5.54  	int op, operation = (req->operation == BLKIF_OP_WRITE) ? WRITE : READ;
    5.55  	struct gnttab_map_grant_ref map[BLKIF_MAX_SEGMENTS_PER_REQUEST*2];
    5.56  	unsigned int nseg;
     6.1 --- a/linux-2.6-xen-sparse/drivers/xen/blktap/common.h	Tue Aug 15 19:53:55 2006 +0100
     6.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blktap/common.h	Wed Aug 16 11:36:13 2006 +0100
     6.3 @@ -49,7 +49,7 @@
     6.4  
     6.5  #define WPRINTK(fmt, args...) printk(KERN_WARNING "blk_tap: " fmt, ##args)
     6.6  
     6.7 -struct backend_info; 
     6.8 +struct backend_info;
     6.9  
    6.10  typedef struct blkif_st {
    6.11  	/* Unique identifier for this interface. */
    6.12 @@ -62,7 +62,7 @@ typedef struct blkif_st {
    6.13  	blkif_back_ring_t blk_ring;
    6.14  	struct vm_struct *blk_ring_area;
    6.15  	/* Back pointer to the backend_info. */
    6.16 -	struct backend_info *be; 
    6.17 +	struct backend_info *be;
    6.18  	/* Private fields. */
    6.19  	spinlock_t       blk_ring_lock;
    6.20  	atomic_t         refcnt;
     7.1 --- a/linux-2.6-xen-sparse/drivers/xen/blktap/xenbus.c	Tue Aug 15 19:53:55 2006 +0100
     7.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blktap/xenbus.c	Wed Aug 16 11:36:13 2006 +0100
     7.3 @@ -174,7 +174,7 @@ static int blktap_probe(struct xenbus_de
     7.4  	}
     7.5  
     7.6  	/* setup back pointer */
     7.7 -	be->blkif->be = be; 
     7.8 +	be->blkif->be = be;
     7.9  	be->blkif->sectors = 0;
    7.10  
    7.11  	/* set a watch on disk info, waiting for userspace to update details*/
     8.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/common.h	Tue Aug 15 19:53:55 2006 +0100
     8.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/common.h	Wed Aug 16 11:36:13 2006 +0100
     8.3 @@ -64,9 +64,9 @@ typedef struct netif_st {
     8.4  
     8.5  	/* Physical parameters of the comms window. */
     8.6  	grant_handle_t   tx_shmem_handle;
     8.7 -	grant_ref_t      tx_shmem_ref; 
     8.8 +	grant_ref_t      tx_shmem_ref;
     8.9  	grant_handle_t   rx_shmem_handle;
    8.10 -	grant_ref_t      rx_shmem_ref; 
    8.11 +	grant_ref_t      rx_shmem_ref;
    8.12  	unsigned int     evtchn;
    8.13  	unsigned int     irq;
    8.14  
     9.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Tue Aug 15 19:53:55 2006 +0100
     9.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Wed Aug 16 11:36:13 2006 +0100
     9.3 @@ -328,7 +328,7 @@ static void xen_network_done_notify(void
     9.4  /* 
     9.5   * Add following to poll() function in NAPI driver (Tigon3 is example):
     9.6   *  if ( xen_network_done() )
     9.7 - *      tg3_enable_ints(tp); 
     9.8 + *      tg3_enable_ints(tp);
     9.9   */
    9.10  int xen_network_done(void)
    9.11  {
    9.12 @@ -478,7 +478,7 @@ static void netbk_add_frag_responses(net
    9.13  
    9.14  static void net_rx_action(unsigned long unused)
    9.15  {
    9.16 -	netif_t *netif = NULL; 
    9.17 +	netif_t *netif = NULL;
    9.18  	s8 status;
    9.19  	u16 id, irq, flags;
    9.20  	netif_rx_response_t *resp;
    9.21 @@ -1095,7 +1095,7 @@ static void net_tx_action(unsigned long 
    9.22  		if (unlikely(txreq.size < ETH_HLEN)) {
    9.23  			DPRINTK("Bad packet size: %d\n", txreq.size);
    9.24  			netbk_tx_err(netif, &txreq, i);
    9.25 -			continue; 
    9.26 +			continue;
    9.27  		}
    9.28  
    9.29  		/* No crossing a page as the payload mustn't fragment. */
    10.1 --- a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c	Tue Aug 15 19:53:55 2006 +0100
    10.2 +++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c	Wed Aug 16 11:36:13 2006 +0100
    10.3 @@ -162,7 +162,7 @@ static int privcmd_ioctl(struct inode *i
    10.4  		privcmd_mmapbatch_t m;
    10.5  		struct vm_area_struct *vma = NULL;
    10.6  		xen_pfn_t __user *p;
    10.7 -		unsigned long addr, mfn; 
    10.8 +		unsigned long addr, mfn;
    10.9  		int i;
   10.10  
   10.11  		if (copy_from_user(&m, udata, sizeof(m))) {
    11.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Tue Aug 15 19:53:55 2006 +0100
    11.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Wed Aug 16 11:36:13 2006 +0100
    11.3 @@ -844,7 +844,7 @@ static int resume_dev(struct device *dev
    11.4  			printk(KERN_WARNING
    11.5  			       "xenbus: resume %s failed: %i\n", 
    11.6  			       dev->bus_id, err);
    11.7 -			return err; 
    11.8 +			return err;
    11.9  		}
   11.10  	}
   11.11  
   11.12 @@ -856,7 +856,7 @@ static int resume_dev(struct device *dev
   11.13  		return err;
   11.14  	}
   11.15  
   11.16 -	return 0; 
   11.17 +	return 0;
   11.18  }
   11.19  
   11.20  void xenbus_suspend(void)
    12.1 --- a/xen/acm/acm_core.c	Tue Aug 15 19:53:55 2006 +0100
    12.2 +++ b/xen/acm/acm_core.c	Wed Aug 16 11:36:13 2006 +0100
    12.3 @@ -206,7 +206,7 @@ acm_setup(unsigned int *initrdidx,
    12.4      for (i = mbi->mods_count-1; i >= 1; i--)
    12.5      {
    12.6          struct acm_policy_buffer *pol;
    12.7 -        char *_policy_start; 
    12.8 +        char *_policy_start;
    12.9          unsigned long _policy_len;
   12.10  #if defined(__i386__)
   12.11          _policy_start = (char *)(initial_images_start + (mod[i].mod_start-mod[0].mod_start));
   12.12 @@ -342,7 +342,7 @@ acm_init_domain_ssid(domid_t id, ssidref
   12.13      {
   12.14          printk("%s: ERROR instantiating individual ssids for domain 0x%02x.\n",
   12.15                 __func__, subj->domain_id);
   12.16 -        acm_free_domain_ssid(ssid); 
   12.17 +        acm_free_domain_ssid(ssid);
   12.18          put_domain(subj);
   12.19          return ACM_INIT_SSID_ERROR;
   12.20      }
    13.1 --- a/xen/acm/acm_simple_type_enforcement_hooks.c	Tue Aug 15 19:53:55 2006 +0100
    13.2 +++ b/xen/acm/acm_simple_type_enforcement_hooks.c	Wed Aug 16 11:36:13 2006 +0100
    13.3 @@ -86,10 +86,10 @@ int acm_init_ste_policy(void)
    13.4  
    13.5      /* init stats */
    13.6      atomic_set(&(ste_bin_pol.ec_eval_count), 0);
    13.7 -    atomic_set(&(ste_bin_pol.ec_denied_count), 0); 
    13.8 +    atomic_set(&(ste_bin_pol.ec_denied_count), 0);
    13.9      atomic_set(&(ste_bin_pol.ec_cachehit_count), 0);
   13.10      atomic_set(&(ste_bin_pol.gt_eval_count), 0);
   13.11 -    atomic_set(&(ste_bin_pol.gt_denied_count), 0); 
   13.12 +    atomic_set(&(ste_bin_pol.gt_denied_count), 0);
   13.13      atomic_set(&(ste_bin_pol.gt_cachehit_count), 0);
   13.14      return ACM_OK;
   13.15  }
   13.16 @@ -100,7 +100,7 @@ static int
   13.17  ste_init_domain_ssid(void **ste_ssid, ssidref_t ssidref)
   13.18  {
   13.19      int i;
   13.20 -    struct ste_ssid *ste_ssidp = xmalloc(struct ste_ssid); 
   13.21 +    struct ste_ssid *ste_ssidp = xmalloc(struct ste_ssid);
   13.22      traceprintk("%s.\n", __func__);
   13.23  
   13.24      if (ste_ssidp == NULL)
   13.25 @@ -309,7 +309,7 @@ ste_set_policy(u8 *buf, u32 buf_size)
   13.26             sizeof(domaintype_t),
   13.27             ste_buf->ste_max_ssidrefs*ste_buf->ste_max_types);
   13.28  
   13.29 -    /* 2. now re-calculate sharing decisions based on running domains; 
   13.30 +    /* 2. now re-calculate sharing decisions based on running domains;
   13.31       *    this can fail if new policy is conflicting with sharing of running domains 
   13.32       *    now: reject violating new policy; future: adjust sharing through revoking sharing */
   13.33      if (ste_init_state(ste_buf, (domaintype_t *)ssidrefsbuf)) {
   13.34 @@ -349,11 +349,11 @@ ste_dump_stats(u8 *buf, u16 buf_len)
   13.35      stats.ec_eval_count = htonl(atomic_read(&ste_bin_pol.ec_eval_count));
   13.36      stats.gt_eval_count = htonl(atomic_read(&ste_bin_pol.gt_eval_count));
   13.37      stats.ec_denied_count = htonl(atomic_read(&ste_bin_pol.ec_denied_count));
   13.38 -    stats.gt_denied_count = htonl(atomic_read(&ste_bin_pol.gt_denied_count)); 
   13.39 +    stats.gt_denied_count = htonl(atomic_read(&ste_bin_pol.gt_denied_count));
   13.40      stats.ec_cachehit_count = htonl(atomic_read(&ste_bin_pol.ec_cachehit_count));
   13.41      stats.gt_cachehit_count = htonl(atomic_read(&ste_bin_pol.gt_cachehit_count));
   13.42  
   13.43 -    if (buf_len < sizeof(struct acm_ste_stats_buffer))
   13.44 +    if (buf_len < sizeof(struct acm_ste_stats_buffer)
   13.45          return -ENOMEM;
   13.46  
   13.47      memcpy(buf, &stats, sizeof(struct acm_ste_stats_buffer));
   13.48 @@ -523,8 +523,8 @@ ste_pre_eventchannel_unbound(domid_t id1
   13.49          cache_result(subj, obj);
   13.50          ret = ACM_ACCESS_PERMITTED;
   13.51      } else {
   13.52 -        atomic_inc(&ste_bin_pol.ec_denied_count); 
   13.53 -        ret = ACM_ACCESS_DENIED; 
   13.54 +        atomic_inc(&ste_bin_pol.ec_denied_count);
   13.55 +        ret = ACM_ACCESS_DENIED;
   13.56      }
   13.57    out:
   13.58      if (obj != NULL)
   13.59 @@ -569,8 +569,8 @@ ste_pre_eventchannel_interdomain(domid_t
   13.60          cache_result(subj, obj);
   13.61          ret = ACM_ACCESS_PERMITTED;
   13.62      } else {
   13.63 -        atomic_inc(&ste_bin_pol.ec_denied_count); 
   13.64 -        ret = ACM_ACCESS_DENIED; 
   13.65 +        atomic_inc(&ste_bin_pol.ec_denied_count);
   13.66 +        ret = ACM_ACCESS_DENIED;
   13.67      }
   13.68   out:
   13.69      if (obj != NULL)
   13.70 @@ -599,9 +599,9 @@ ste_pre_grant_map_ref (domid_t id) {
   13.71          cache_result(subj, obj);
   13.72          ret = ACM_ACCESS_PERMITTED;
   13.73      } else {
   13.74 -        atomic_inc(&ste_bin_pol.gt_denied_count); 
   13.75 +        atomic_inc(&ste_bin_pol.gt_denied_count);
   13.76          printkd("%s: ACCESS DENIED!\n", __func__);
   13.77 -        ret = ACM_ACCESS_DENIED; 
   13.78 +        ret = ACM_ACCESS_DENIED;
   13.79      }
   13.80      if (obj != NULL)
   13.81          put_domain(obj);
   13.82 @@ -637,8 +637,8 @@ ste_pre_grant_setup (domid_t id) {
   13.83          cache_result(subj, obj);
   13.84          ret = ACM_ACCESS_PERMITTED;
   13.85      } else {
   13.86 -        atomic_inc(&ste_bin_pol.gt_denied_count); 
   13.87 -        ret = ACM_ACCESS_DENIED; 
   13.88 +        atomic_inc(&ste_bin_pol.gt_denied_count);
   13.89 +        ret = ACM_ACCESS_DENIED;
   13.90      }
   13.91      if (obj != NULL)
   13.92          put_domain(obj);
    14.1 --- a/xen/arch/x86/acpi/boot.c	Tue Aug 15 19:53:55 2006 +0100
    14.2 +++ b/xen/arch/x86/acpi/boot.c	Wed Aug 16 11:36:13 2006 +0100
    14.3 @@ -107,7 +107,7 @@ char *__acpi_map_table(unsigned long phy
    14.4  	int idx;
    14.5  
    14.6  	if (phys + size < 8 * 1024 * 1024) 
    14.7 -		return __va(phys); 
    14.8 +		return __va(phys);
    14.9  
   14.10  	offset = phys & (PAGE_SIZE - 1);
   14.11  	mapped_size = PAGE_SIZE - offset;
    15.1 --- a/xen/arch/x86/audit.c	Tue Aug 15 19:53:55 2006 +0100
    15.2 +++ b/xen/arch/x86/audit.c	Wed Aug 16 11:36:13 2006 +0100
    15.3 @@ -63,7 +63,7 @@ int audit_adjust_pgtables(struct domain 
    15.4          /* 32b PAE */
    15.5          if ( (( mfn_to_page(mfn)->u.inuse.type_info & PGT_va_mask ) 
    15.6  	    >> PGT_va_shift) == 3 )
    15.7 -            return l2_table_offset(HYPERVISOR_VIRT_START); 
    15.8 +            return l2_table_offset(HYPERVISOR_VIRT_START);
    15.9          else
   15.10              return L2_PAGETABLE_ENTRIES;
   15.11  #else
    16.1 --- a/xen/arch/x86/cpu/amd.c	Tue Aug 15 19:53:55 2006 +0100
    16.2 +++ b/xen/arch/x86/cpu/amd.c	Wed Aug 16 11:36:13 2006 +0100
    16.3 @@ -280,7 +280,7 @@ static void __init init_amd(struct cpuin
    16.4  		set_bit(X86_FEATURE_K8, c->x86_capability);
    16.5  		break;
    16.6  	case 6:
    16.7 -		set_bit(X86_FEATURE_K7, c->x86_capability); 
    16.8 +		set_bit(X86_FEATURE_K7, c->x86_capability);
    16.9  		break;
   16.10  	}
   16.11  
    17.1 --- a/xen/arch/x86/cpu/cyrix.c	Tue Aug 15 19:53:55 2006 +0100
    17.2 +++ b/xen/arch/x86/cpu/cyrix.c	Wed Aug 16 11:36:13 2006 +0100
    17.3 @@ -145,7 +145,7 @@ static void __init set_cx86_inc(void)
    17.4  	setCx86(CX86_PCR1, getCx86(CX86_PCR1) | 0x02);
    17.5  	/* PCR0 -- Performance Control */
    17.6  	/* Incrementor Margin 10 */
    17.7 -	setCx86(CX86_PCR0, getCx86(CX86_PCR0) | 0x04); 
    17.8 +	setCx86(CX86_PCR0, getCx86(CX86_PCR0) | 0x04);
    17.9  	setCx86(CX86_CCR3, ccr3);	/* disable MAPEN */
   17.10  }
   17.11  
    18.1 --- a/xen/arch/x86/cpu/transmeta.c	Tue Aug 15 19:53:55 2006 +0100
    18.2 +++ b/xen/arch/x86/cpu/transmeta.c	Wed Aug 16 11:36:13 2006 +0100
    18.3 @@ -19,7 +19,7 @@ static void __init init_transmeta(struct
    18.4  	max = cpuid_eax(0x80860000);
    18.5  	cpu_rev = 0;
    18.6  	if ( max >= 0x80860001 ) {
    18.7 -		cpuid(0x80860001, &dummy, &cpu_rev, &cpu_freq, &cpu_flags); 
    18.8 +		cpuid(0x80860001, &dummy, &cpu_rev, &cpu_freq, &cpu_flags);
    18.9  		if (cpu_rev != 0x02000000) {
   18.10  			printk(KERN_INFO "CPU: Processor revision %u.%u.%u.%u, %u MHz\n",
   18.11  				(cpu_rev >> 24) & 0xff,
    19.1 --- a/xen/arch/x86/dmi_scan.c	Tue Aug 15 19:53:55 2006 +0100
    19.2 +++ b/xen/arch/x86/dmi_scan.c	Wed Aug 16 11:36:13 2006 +0100
    19.3 @@ -199,11 +199,11 @@ extern int acpi_force;
    19.4  static __init __attribute__((unused)) int dmi_disable_acpi(struct dmi_blacklist *d) 
    19.5  { 
    19.6  	if (!acpi_force) { 
    19.7 -		printk(KERN_NOTICE "%s detected: acpi off\n",d->ident); 
    19.8 +		printk(KERN_NOTICE "%s detected: acpi off\n",d->ident);
    19.9  		disable_acpi();
   19.10  	} else { 
   19.11  		printk(KERN_NOTICE 
   19.12 -		       "Warning: DMI blacklist says broken, but acpi forced\n"); 
   19.13 +		       "Warning: DMI blacklist says broken, but acpi forced\n");
   19.14  	}
   19.15  	return 0;
   19.16  } 
   19.17 @@ -214,12 +214,12 @@ static __init __attribute__((unused)) in
   19.18  static __init __attribute__((unused)) int force_acpi_ht(struct dmi_blacklist *d) 
   19.19  { 
   19.20  	if (!acpi_force) { 
   19.21 -		printk(KERN_NOTICE "%s detected: force use of acpi=ht\n", d->ident); 
   19.22 +		printk(KERN_NOTICE "%s detected: force use of acpi=ht\n", d->ident);
   19.23  		disable_acpi();
   19.24 -		acpi_ht = 1; 
   19.25 +		acpi_ht = 1;
   19.26  	} else { 
   19.27  		printk(KERN_NOTICE 
   19.28 -		       "Warning: acpi=force overrules DMI blacklist: acpi=ht\n"); 
   19.29 +		       "Warning: acpi=force overrules DMI blacklist: acpi=ht\n");
   19.30  	}
   19.31  	return 0;
   19.32  } 
    20.1 --- a/xen/arch/x86/dom0_ops.c	Tue Aug 15 19:53:55 2006 +0100
    20.2 +++ b/xen/arch/x86/dom0_ops.c	Wed Aug 16 11:36:13 2006 +0100
    20.3 @@ -84,7 +84,7 @@ long arch_do_dom0_op(struct dom0_op *op,
    20.4  
    20.5      case DOM0_SHADOW_CONTROL:
    20.6      {
    20.7 -        struct domain *d; 
    20.8 +        struct domain *d;
    20.9          ret = -ESRCH;
   20.10          d = find_domain_by_id(op->u.shadow_control.domain);
   20.11          if ( d != NULL )
    21.1 --- a/xen/arch/x86/domain_build.c	Tue Aug 15 19:53:55 2006 +0100
    21.2 +++ b/xen/arch/x86/domain_build.c	Wed Aug 16 11:36:13 2006 +0100
    21.3 @@ -469,7 +469,7 @@ int construct_dom0(struct domain *d,
    21.4      {
    21.5          if ( !((unsigned long)l1tab & (PAGE_SIZE-1)) )
    21.6          {
    21.7 -            l1start = l1tab = (l1_pgentry_t *)mpt_alloc; 
    21.8 +            l1start = l1tab = (l1_pgentry_t *)mpt_alloc;
    21.9              mpt_alloc += PAGE_SIZE;
   21.10              *l2tab = l2e_from_paddr((unsigned long)l1start, L2_PROT);
   21.11              l2tab++;
   21.12 @@ -661,7 +661,7 @@ int construct_dom0(struct domain *d,
   21.13              if ( !((unsigned long)++l2tab & (PAGE_SIZE - 1)) )
   21.14              {
   21.15                  if ( !((unsigned long)++l3tab & (PAGE_SIZE - 1)) )
   21.16 -                    l3start = l3tab = l4e_to_l3e(*++l4tab); 
   21.17 +                    l3start = l3tab = l4e_to_l3e(*++l4tab);
   21.18                  l2start = l2tab = l3e_to_l2e(*l3tab);
   21.19              }
   21.20              l1start = l1tab = l2e_to_l1e(*l2tab);
    22.1 --- a/xen/arch/x86/genapic/bigsmp.c	Tue Aug 15 19:53:55 2006 +0100
    22.2 +++ b/xen/arch/x86/genapic/bigsmp.c	Wed Aug 16 11:36:13 2006 +0100
    22.3 @@ -41,7 +41,7 @@ static __init int probe_bigsmp(void)
    22.4  		dmi_bigsmp = 1;
    22.5  	else
    22.6  		dmi_check_system(bigsmp_dmi_table);
    22.7 -	return dmi_bigsmp; 
    22.8 +	return dmi_bigsmp;
    22.9  } 
   22.10  
   22.11  struct genapic apic_bigsmp = {
    23.1 --- a/xen/arch/x86/genapic/es7000.h	Tue Aug 15 19:53:55 2006 +0100
    23.2 +++ b/xen/arch/x86/genapic/es7000.h	Wed Aug 16 11:36:13 2006 +0100
    23.3 @@ -71,8 +71,8 @@ struct es7000_mem_info {
    23.4  	unsigned char type;   
    23.5  	unsigned char length;
    23.6  	unsigned char resv[6];
    23.7 -	unsigned long long  start; 
    23.8 -	unsigned long long  size; 
    23.9 +	unsigned long long  start;
   23.10 +	unsigned long long  size;
   23.11  };
   23.12  
   23.13  struct es7000_oem_table {
    24.1 --- a/xen/arch/x86/genapic/probe.c	Tue Aug 15 19:53:55 2006 +0100
    24.2 +++ b/xen/arch/x86/genapic/probe.c	Wed Aug 16 11:36:13 2006 +0100
    24.3 @@ -65,7 +65,7 @@ void __init generic_apic_probe(void)
    24.4  	for (i = 0; !changed && apic_probe[i]; i++) { 
    24.5  		if (apic_probe[i]->probe()) {
    24.6  			changed = 1;
    24.7 -			genapic = apic_probe[i]; 
    24.8 +			genapic = apic_probe[i];
    24.9  		} 
   24.10  	}
   24.11  	if (!changed) 
    25.1 --- a/xen/arch/x86/hvm/svm/svm.c	Tue Aug 15 19:53:55 2006 +0100
    25.2 +++ b/xen/arch/x86/hvm/svm/svm.c	Wed Aug 16 11:36:13 2006 +0100
    25.3 @@ -981,7 +981,7 @@ static void svm_do_general_protection_fa
    25.4          printf("Huh? We got a GP Fault with an invalid IDTR!\n");
    25.5          svm_dump_vmcb(__func__, vmcb);
    25.6          svm_dump_regs(__func__, regs);
    25.7 -        svm_dump_inst(vmcb->rip); 
    25.8 +        svm_dump_inst(vmcb->rip);
    25.9          __hvm_bug(regs);
   25.10      }
   25.11  
   25.12 @@ -1267,7 +1267,7 @@ static void svm_dr_access (struct vcpu *
   25.13      {
   25.14      case TYPE_MOV_TO_DR: 
   25.15          inst_len = __get_instruction_length(vmcb, INSTR_MOV2DR, buffer);
   25.16 -        v->arch.guest_context.debugreg[reg] = *reg_p; 
   25.17 +        v->arch.guest_context.debugreg[reg] = *reg_p;
   25.18          break;
   25.19      case TYPE_MOV_FROM_DR:
   25.20          inst_len = __get_instruction_length(vmcb, INSTR_MOVDR2, buffer);
    26.1 --- a/xen/arch/x86/hvm/svm/vmcb.c	Tue Aug 15 19:53:55 2006 +0100
    26.2 +++ b/xen/arch/x86/hvm/svm/vmcb.c	Wed Aug 16 11:36:13 2006 +0100
    26.3 @@ -309,10 +309,6 @@ int construct_vmcb(struct arch_svm_struc
    26.4          goto err_out;
    26.5      }
    26.6  
    26.7 -    /* update the HSA for the current Core */
    26.8 -#if 0
    26.9 -    set_hsa_to_guest( arch_svm );
   26.10 -#endif
   26.11      arch_svm->vmcb_pa  = (u64) virt_to_maddr(arch_svm->vmcb);
   26.12  
   26.13      if ((error = construct_vmcb_controls(arch_svm))) 
    27.1 --- a/xen/arch/x86/io_apic.c	Tue Aug 15 19:53:55 2006 +0100
    27.2 +++ b/xen/arch/x86/io_apic.c	Wed Aug 16 11:36:13 2006 +0100
    27.3 @@ -639,7 +639,7 @@ static int pin_2_irq(int idx, int apic, 
    27.4      }
    27.5      default:
    27.6      {
    27.7 -        printk(KERN_ERR "unknown bus type %d.\n",bus); 
    27.8 +        printk(KERN_ERR "unknown bus type %d.\n",bus);
    27.9          irq = 0;
   27.10          break;
   27.11      }
    28.1 --- a/xen/arch/x86/microcode.c	Tue Aug 15 19:53:55 2006 +0100
    28.2 +++ b/xen/arch/x86/microcode.c	Wed Aug 16 11:36:13 2006 +0100
    28.3 @@ -152,7 +152,7 @@ static void collect_cpu_info (void *unus
    28.4  	unsigned int val[2];
    28.5  
    28.6  	uci->sig = uci->pf = uci->rev = uci->cksum = 0;
    28.7 -	uci->err = MC_NOTFOUND; 
    28.8 +	uci->err = MC_NOTFOUND;
    28.9  	uci->mc = NULL;
   28.10  
   28.11  	if (c->x86_vendor != X86_VENDOR_INTEL || c->x86 < 6 ||
   28.12 @@ -460,7 +460,7 @@ int microcode_update(void *buf, unsigned
   28.13  	int ret;
   28.14  
   28.15  	if (len < DEFAULT_UCODE_TOTALSIZE) {
   28.16 -		printk(KERN_ERR "microcode: not enough data\n"); 
   28.17 +		printk(KERN_ERR "microcode: not enough data\n");
   28.18  		return -EINVAL;
   28.19  	}
   28.20  
    29.1 --- a/xen/arch/x86/mm.c	Tue Aug 15 19:53:55 2006 +0100
    29.2 +++ b/xen/arch/x86/mm.c	Wed Aug 16 11:36:13 2006 +0100
    29.3 @@ -1377,7 +1377,7 @@ static int mod_l3_entry(l3_pgentry_t *pl
    29.4  #if CONFIG_PAGING_LEVELS >= 4
    29.5          if ( unlikely(!l2_backptr(&vaddr, pgentry_ptr_to_slot(pl3e), type)) ||
    29.6               unlikely(!get_page_from_l3e(nl3e, pfn, current->domain, vaddr)) )
    29.7 -            return 0; 
    29.8 +            return 0;
    29.9  #else
   29.10          vaddr = (((unsigned long)pl3e & ~PAGE_MASK) / sizeof(l3_pgentry_t))
   29.11              << L3_PAGETABLE_SHIFT;
   29.12 @@ -2190,7 +2190,7 @@ int do_mmu_update(
   29.13          goto out;
   29.14      }
   29.15  
   29.16 -    perfc_incrc(calls_to_mmu_update); 
   29.17 +    perfc_incrc(calls_to_mmu_update);
   29.18      perfc_addc(num_page_updates, count);
   29.19      perfc_incr_histo(bpt_updates, count, PT_UPDATES);
   29.20  
    30.1 --- a/xen/arch/x86/mpparse.c	Tue Aug 15 19:53:55 2006 +0100
    30.2 +++ b/xen/arch/x86/mpparse.c	Wed Aug 16 11:36:13 2006 +0100
    30.3 @@ -107,7 +107,7 @@ static int __init mpf_checksum(unsigned 
    30.4   * doing this ....
    30.5   */
    30.6  
    30.7 -static int mpc_record; 
    30.8 +static int mpc_record;
    30.9  static struct mpc_config_translation *translation_table[MAX_MPC_ENTRY] __initdata;
   30.10  
   30.11  #ifdef CONFIG_X86_NUMAQ
    31.1 --- a/xen/arch/x86/oprofile/nmi_int.c	Tue Aug 15 19:53:55 2006 +0100
    31.2 +++ b/xen/arch/x86/oprofile/nmi_int.c	Wed Aug 16 11:36:13 2006 +0100
    31.3 @@ -59,7 +59,7 @@ int nmi_callback(struct cpu_user_regs *r
    31.4  static void nmi_cpu_save_registers(struct op_msrs *msrs)
    31.5  {
    31.6  	unsigned int const nr_ctrs = model->num_counters;
    31.7 -	unsigned int const nr_ctrls = model->num_controls; 
    31.8 +	unsigned int const nr_ctrls = model->num_controls;
    31.9  	struct op_msr *counters = msrs->counters;
   31.10  	struct op_msr *controls = msrs->controls;
   31.11  	unsigned int i;
   31.12 @@ -180,7 +180,7 @@ void nmi_disable_virq(void)
   31.13  static void nmi_restore_registers(struct op_msrs * msrs)
   31.14  {
   31.15  	unsigned int const nr_ctrs = model->num_counters;
   31.16 -	unsigned int const nr_ctrls = model->num_controls; 
   31.17 +	unsigned int const nr_ctrls = model->num_controls;
   31.18  	struct op_msr * counters = msrs->counters;
   31.19  	struct op_msr * controls = msrs->controls;
   31.20  	unsigned int i;
    32.1 --- a/xen/arch/x86/oprofile/op_model_p4.c	Tue Aug 15 19:53:55 2006 +0100
    32.2 +++ b/xen/arch/x86/oprofile/op_model_p4.c	Wed Aug 16 11:36:13 2006 +0100
    32.3 @@ -401,7 +401,7 @@ static unsigned long reset_value[NUM_COU
    32.4  
    32.5  static void p4_fill_in_addresses(struct op_msrs * const msrs)
    32.6  {
    32.7 -	unsigned int i; 
    32.8 +	unsigned int i;
    32.9  	unsigned int addr, stag;
   32.10  
   32.11  	setup_num_counters();
    33.1 --- a/xen/arch/x86/oprofile/xenoprof.c	Tue Aug 15 19:53:55 2006 +0100
    33.2 +++ b/xen/arch/x86/oprofile/xenoprof.c	Wed Aug 16 11:36:13 2006 +0100
    33.3 @@ -255,7 +255,7 @@ int reset_active(struct domain *d)
    33.4      active_ready[ind] = 0;
    33.5      active_domains[ind] = NULL;
    33.6      activated--;
    33.7 -    put_domain(d); 
    33.8 +    put_domain(d);
    33.9  
   33.10      if ( activated <= 0 )
   33.11          adomains = 0;
   33.12 @@ -316,7 +316,7 @@ int add_active_list (domid_t domid)
   33.13      if ( adomains >= MAX_OPROF_DOMAINS )
   33.14          return -E2BIG;
   33.15  
   33.16 -    d = find_domain_by_id(domid); 
   33.17 +    d = find_domain_by_id(domid);
   33.18      if ( d == NULL )
   33.19          return -EINVAL;
   33.20  
   33.21 @@ -339,7 +339,7 @@ int add_passive_list(XEN_GUEST_HANDLE(vo
   33.22      if ( copy_from_guest(&passive, arg, 1) )
   33.23          return -EFAULT;
   33.24  
   33.25 -    d = find_domain_by_id(passive.domain_id); 
   33.26 +    d = find_domain_by_id(passive.domain_id);
   33.27      if ( d == NULL )
   33.28          return -EINVAL;
   33.29  
    34.1 --- a/xen/arch/x86/setup.c	Tue Aug 15 19:53:55 2006 +0100
    34.2 +++ b/xen/arch/x86/setup.c	Wed Aug 16 11:36:13 2006 +0100
    34.3 @@ -44,7 +44,7 @@ boolean_param("nosmp", opt_nosmp);
    34.4  
    34.5  /* maxcpus: maximum number of CPUs to activate. */
    34.6  static unsigned int max_cpus = NR_CPUS;
    34.7 -integer_param("maxcpus", max_cpus); 
    34.8 +integer_param("maxcpus", max_cpus);
    34.9  
   34.10  /* opt_watchdog: If true, run a watchdog NMI on each processor. */
   34.11  static int opt_watchdog = 0;
    35.1 --- a/xen/arch/x86/shadow.c	Tue Aug 15 19:53:55 2006 +0100
    35.2 +++ b/xen/arch/x86/shadow.c	Wed Aug 16 11:36:13 2006 +0100
    35.3 @@ -1874,7 +1874,7 @@ static int resync_all(struct domain *d, 
    35.4                      {
    35.5                          if ( entry_get_flags(shadow_pt[i]) & _PAGE_PRESENT )
    35.6                              put_shadow_ref(entry_get_pfn(shadow_pt[i]));
    35.7 -                         shadow_pt[i] = entry_empty(); 
    35.8 +                         shadow_pt[i] = entry_empty();
    35.9                          continue;
   35.10                      }
   35.11  
   35.12 @@ -1933,7 +1933,7 @@ static int resync_all(struct domain *d, 
   35.13                      {
   35.14                          if ( l4e_get_flags(shadow4[i]) & _PAGE_PRESENT )
   35.15                              put_shadow_ref(l4e_get_pfn(shadow4[i]));
   35.16 -                        shadow4[i] = l4e_empty(); 
   35.17 +                        shadow4[i] = l4e_empty();
   35.18                          continue;
   35.19                      }
   35.20  
   35.21 @@ -2007,7 +2007,7 @@ static int resync_all_levels_guest_page(
   35.22  {
   35.23      int need_flush = 0;
   35.24  
   35.25 -    need_flush |= resync_all(d, PGT_l1_shadow); 
   35.26 +    need_flush |= resync_all(d, PGT_l1_shadow);
   35.27      if ( d->arch.ops->guest_paging_levels == PAGING_L2 &&
   35.28           shadow_mode_translate(d) )
   35.29      {
   35.30 @@ -3223,7 +3223,7 @@ static unsigned long shadow_l3_table(
   35.31           * Xen private mappings. Use the va_mask part.
   35.32           */
   35.33          mfn_to_page(s2mfn)->u.inuse.type_info |= 
   35.34 -            (unsigned long) 3 << PGT_score_shift; 
   35.35 +            (unsigned long) 3 << PGT_score_shift;
   35.36  
   35.37          memset(spl2e, 0, 
   35.38                 (L2_PAGETABLE_FIRST_XEN_SLOT & (L2_PAGETABLE_ENTRIES-1)) * sizeof(l2_pgentry_t));
    36.1 --- a/xen/arch/x86/shadow32.c	Tue Aug 15 19:53:55 2006 +0100
    36.2 +++ b/xen/arch/x86/shadow32.c	Wed Aug 16 11:36:13 2006 +0100
    36.3 @@ -1159,7 +1159,7 @@ int __shadow_mode_enable(struct domain *
    36.4      int new_modes = (mode & ~d->arch.shadow_mode);
    36.5  
    36.6      if(!new_modes) /* Nothing to do - return success */
    36.7 -        return 0; 
    36.8 +        return 0;
    36.9  
   36.10      // can't take anything away by calling this function.
   36.11      ASSERT(!(d->arch.shadow_mode & ~mode));
   36.12 @@ -1298,7 +1298,7 @@ int __shadow_mode_enable(struct domain *
   36.13          audit_adjust_pgtables(d, -1, 1);
   36.14  
   36.15  
   36.16 -        for (list_ent = d->page_list.next; list_ent != &d->page_list; 
   36.17 +        for (list_ent = d->page_list.next; list_ent != &d->page_list;
   36.18               list_ent = page->list.next) {
   36.19              
   36.20              page = list_entry(list_ent, struct page_info, list);
   36.21 @@ -1525,7 +1525,7 @@ static int shadow_mode_table_op(
   36.22          }
   36.23  
   36.24          if ( sc->pages > d->arch.shadow_dirty_bitmap_size )
   36.25 -            sc->pages = d->arch.shadow_dirty_bitmap_size; 
   36.26 +            sc->pages = d->arch.shadow_dirty_bitmap_size;
   36.27  
   36.28  #define chunk (8*1024) /* Transfer and clear in 1kB chunks for L1 cache. */
   36.29          for ( i = 0; i < sc->pages; i += chunk )
   36.30 @@ -1561,7 +1561,7 @@ static int shadow_mode_table_op(
   36.31          }
   36.32   
   36.33          if ( sc->pages > d->arch.shadow_dirty_bitmap_size )
   36.34 -            sc->pages = d->arch.shadow_dirty_bitmap_size; 
   36.35 +            sc->pages = d->arch.shadow_dirty_bitmap_size;
   36.36  
   36.37          if ( copy_to_guest(sc->dirty_bitmap, 
   36.38                             d->arch.shadow_dirty_bitmap,
   36.39 @@ -2704,7 +2704,7 @@ static int resync_all(struct domain *d, 
   36.40  
   36.41                  __shadow_get_l2e(entry->v, entry->va, &l2e);
   36.42                  if (l2e_get_flags(l2e) & _PAGE_PRESENT) {
   36.43 -                    put_shadow_ref(l2e_get_pfn(l2e)); 
   36.44 +                    put_shadow_ref(l2e_get_pfn(l2e));
   36.45                      l2e = l2e_empty();
   36.46                      __shadow_set_l2e(entry->v, entry->va, l2e);
   36.47  
   36.48 @@ -3579,7 +3579,7 @@ int check_l2_table(
   36.49                  ((SH_LINEAR_PT_VIRT_START >> L2_PAGETABLE_SHIFT) -
   36.50                   DOMAIN_ENTRIES_PER_L2_PAGETABLE) * sizeof(l2_pgentry_t)) )
   36.51      {
   36.52 -        for ( i = DOMAIN_ENTRIES_PER_L2_PAGETABLE; 
   36.53 +        for ( i = DOMAIN_ENTRIES_PER_L2_PAGETABLE;
   36.54                i < (SH_LINEAR_PT_VIRT_START >> L2_PAGETABLE_SHIFT);
   36.55                i++ )
   36.56              printk("+++ (%d) %lx %lx\n",i,
    37.1 --- a/xen/arch/x86/shadow_public.c	Tue Aug 15 19:53:55 2006 +0100
    37.2 +++ b/xen/arch/x86/shadow_public.c	Wed Aug 16 11:36:13 2006 +0100
    37.3 @@ -1228,7 +1228,7 @@ int __shadow_mode_enable(struct domain *
    37.4  
    37.5      if ( shadow_mode_refcounts(d) )
    37.6      {
    37.7 -        struct list_head *list_ent; 
    37.8 +        struct list_head *list_ent;
    37.9          struct page_info *page;
   37.10  
   37.11          /*
   37.12 @@ -1254,7 +1254,7 @@ int __shadow_mode_enable(struct domain *
   37.13          audit_adjust_pgtables(d, -1, 1);
   37.14  
   37.15  
   37.16 -        for (list_ent = d->page_list.next; list_ent != &d->page_list; 
   37.17 +        for (list_ent = d->page_list.next; list_ent != &d->page_list;
   37.18               list_ent = page->list.next) {
   37.19              
   37.20              page = list_entry(list_ent, struct page_info, list);
   37.21 @@ -1343,7 +1343,7 @@ static int shadow_mode_table_op(
   37.22          }
   37.23  
   37.24          if ( sc->pages > d->arch.shadow_dirty_bitmap_size )
   37.25 -            sc->pages = d->arch.shadow_dirty_bitmap_size; 
   37.26 +            sc->pages = d->arch.shadow_dirty_bitmap_size;
   37.27  
   37.28  #define chunk (8*1024) /* Transfer and clear in 1kB chunks for L1 cache. */
   37.29          for ( i = 0; i < sc->pages; i += chunk )
   37.30 @@ -1378,7 +1378,7 @@ static int shadow_mode_table_op(
   37.31          }
   37.32   
   37.33          if ( sc->pages > d->arch.shadow_dirty_bitmap_size )
   37.34 -            sc->pages = d->arch.shadow_dirty_bitmap_size; 
   37.35 +            sc->pages = d->arch.shadow_dirty_bitmap_size;
   37.36  
   37.37          if ( copy_to_guest(sc->dirty_bitmap, 
   37.38                             d->arch.shadow_dirty_bitmap,
    38.1 --- a/xen/arch/x86/traps.c	Tue Aug 15 19:53:55 2006 +0100
    38.2 +++ b/xen/arch/x86/traps.c	Wed Aug 16 11:36:13 2006 +0100
    38.3 @@ -785,7 +785,7 @@ static int __spurious_page_fault(
    38.4  #endif
    38.5  
    38.6  #if CONFIG_PAGING_LEVELS >= 3
    38.7 -    l3t  = map_domain_page(mfn); 
    38.8 +    l3t  = map_domain_page(mfn);
    38.9  #ifdef CONFIG_X86_PAE
   38.10      l3t += (cr3 & 0xFE0UL) >> 3;
   38.11  #endif
    39.1 --- a/xen/arch/x86/x86_64/mm.c	Tue Aug 15 19:53:55 2006 +0100
    39.2 +++ b/xen/arch/x86/x86_64/mm.c	Wed Aug 16 11:36:13 2006 +0100
    39.3 @@ -154,7 +154,7 @@ void subarch_init_memory(void)
    39.4                   (32 + BITS_TO_LONGS(NR_CPUS)*sizeof(long)));
    39.5  
    39.6      /* M2P table is mappable read-only by privileged domains. */
    39.7 -    for ( v  = RDWR_MPT_VIRT_START; 
    39.8 +    for ( v  = RDWR_MPT_VIRT_START;
    39.9            v != RDWR_MPT_VIRT_END;
   39.10            v += 1 << L2_PAGETABLE_SHIFT )
   39.11      {
    40.1 --- a/xen/arch/x86/x86_64/traps.c	Tue Aug 15 19:53:55 2006 +0100
    40.2 +++ b/xen/arch/x86/x86_64/traps.c	Wed Aug 16 11:36:13 2006 +0100
    40.3 @@ -242,7 +242,7 @@ void __init percpu_traps_init(void)
    40.4  
    40.5      /* Skip the NMI and DF stacks. */
    40.6      stack = &stack[2048];
    40.7 -    wrmsr(MSR_LSTAR, (unsigned long)stack, ((unsigned long)stack>>32)); 
    40.8 +    wrmsr(MSR_LSTAR, (unsigned long)stack, ((unsigned long)stack>>32));
    40.9  
   40.10      /* movq %rsp, saversp(%rip) */
   40.11      stack[0] = 0x48;
   40.12 @@ -274,7 +274,7 @@ void __init percpu_traps_init(void)
   40.13  
   40.14      /* Skip the long-mode entry trampoline. */
   40.15      stack = &stack[26];
   40.16 -    wrmsr(MSR_CSTAR, (unsigned long)stack, ((unsigned long)stack>>32)); 
   40.17 +    wrmsr(MSR_CSTAR, (unsigned long)stack, ((unsigned long)stack>>32));
   40.18  
   40.19      /* movq %rsp, saversp(%rip) */
   40.20      stack[0] = 0x48;
    41.1 --- a/xen/common/dom0_ops.c	Tue Aug 15 19:53:55 2006 +0100
    41.2 +++ b/xen/common/dom0_ops.c	Wed Aug 16 11:36:13 2006 +0100
    41.3 @@ -566,7 +566,7 @@ long do_dom0_op(XEN_GUEST_HANDLE(dom0_op
    41.4          ret = read_console_ring(
    41.5              op->u.readconsole.buffer, 
    41.6              &op->u.readconsole.count,
    41.7 -            op->u.readconsole.clear); 
    41.8 +            op->u.readconsole.clear);
    41.9          if ( copy_to_guest(u_dom0_op, op, 1) )
   41.10              ret = -EFAULT;
   41.11      }
   41.12 @@ -584,7 +584,7 @@ long do_dom0_op(XEN_GUEST_HANDLE(dom0_op
   41.13  
   41.14      case DOM0_SETDOMAINMAXMEM:
   41.15      {
   41.16 -        struct domain *d; 
   41.17 +        struct domain *d;
   41.18          unsigned long new_max;
   41.19  
   41.20          ret = -ESRCH;
   41.21 @@ -624,7 +624,7 @@ long do_dom0_op(XEN_GUEST_HANDLE(dom0_op
   41.22  
   41.23      case DOM0_SETDEBUGGING:
   41.24      {
   41.25 -        struct domain *d; 
   41.26 +        struct domain *d;
   41.27          ret = -ESRCH;
   41.28          d = find_domain_by_id(op->u.setdebugging.domain);
   41.29          if ( d != NULL )
    42.1 --- a/xen/common/domain.c	Tue Aug 15 19:53:55 2006 +0100
    42.2 +++ b/xen/common/domain.c	Wed Aug 16 11:36:13 2006 +0100
    42.3 @@ -459,7 +459,7 @@ int set_info_guest(struct domain *d, dom
    42.4      int rc = 0;
    42.5      struct vcpu_guest_context *c = NULL;
    42.6      unsigned long vcpu = setvcpucontext->vcpu;
    42.7 -    struct vcpu *v; 
    42.8 +    struct vcpu *v;
    42.9  
   42.10      if ( (vcpu >= MAX_VIRT_CPUS) || ((v = d->vcpu[vcpu]) == NULL) )
   42.11          return -EINVAL;
    43.1 --- a/xen/common/keyhandler.c	Tue Aug 15 19:53:55 2006 +0100
    43.2 +++ b/xen/common/keyhandler.c	Wed Aug 16 11:36:13 2006 +0100
    43.3 @@ -25,8 +25,8 @@ static struct {
    43.4          irq_keyhandler_t *irq_handler;
    43.5      } u;
    43.6      unsigned int flags;
    43.7 -    char         desc[STR_MAX]; 
    43.8 -} key_table[KEY_MAX]; 
    43.9 +    char         desc[STR_MAX];
   43.10 +} key_table[KEY_MAX];
   43.11  
   43.12  #define KEYHANDLER_IRQ_CALLBACK 0x1
   43.13  
   43.14 @@ -63,7 +63,7 @@ void register_keyhandler(
   43.15      key_table[key].u.handler = handler;
   43.16      key_table[key].flags     = 0;
   43.17      strncpy(key_table[key].desc, desc, STR_MAX);
   43.18 -    key_table[key].desc[STR_MAX-1] = '\0'; 
   43.19 +    key_table[key].desc[STR_MAX-1] = '\0';
   43.20  }
   43.21  
   43.22  void register_irq_keyhandler(
   43.23 @@ -73,12 +73,12 @@ void register_irq_keyhandler(
   43.24      key_table[key].u.irq_handler = handler;
   43.25      key_table[key].flags         = KEYHANDLER_IRQ_CALLBACK;
   43.26      strncpy(key_table[key].desc, desc, STR_MAX);
   43.27 -    key_table[key].desc[STR_MAX-1] = '\0'; 
   43.28 +    key_table[key].desc[STR_MAX-1] = '\0';
   43.29  }
   43.30  
   43.31  static void show_handlers(unsigned char key)
   43.32  {
   43.33 -    int i; 
   43.34 +    int i;
   43.35      printk("'%c' pressed -> showing installed handlers\n", key);
   43.36      for ( i = 0; i < KEY_MAX; i++ ) 
   43.37          if ( key_table[i].u.handler != NULL ) 
   43.38 @@ -96,7 +96,7 @@ static void dump_registers(unsigned char
   43.39  {
   43.40      unsigned int cpu;
   43.41  
   43.42 -    printk("'%c' pressed -> dumping registers\n", key); 
   43.43 +    printk("'%c' pressed -> dumping registers\n", key);
   43.44  
   43.45      /* Get local execution state out immediately, in case we get stuck. */
   43.46      printk("\n*** Dumping CPU%d state: ***\n", smp_processor_id());
   43.47 @@ -113,8 +113,8 @@ static void dump_registers(unsigned char
   43.48  
   43.49  static void halt_machine(unsigned char key, struct cpu_user_regs *regs)
   43.50  {
   43.51 -    printk("'%c' pressed -> rebooting machine\n", key); 
   43.52 -    machine_restart(NULL); 
   43.53 +    printk("'%c' pressed -> rebooting machine\n", key);
   43.54 +    machine_restart(NULL);
   43.55  }
   43.56  
   43.57  static void cpuset_print(char *set, int size, cpumask_t mask)
   43.58 @@ -133,7 +133,7 @@ static void dump_domains(unsigned char k
   43.59      char           cpuset[100];
   43.60  
   43.61      printk("'%c' pressed -> dumping domain info (now=0x%X:%08X)\n", key,
   43.62 -           (u32)(now>>32), (u32)now); 
   43.63 +           (u32)(now>>32), (u32)now);
   43.64  
   43.65      read_lock(&domlist_lock);
   43.66  
   43.67 @@ -273,7 +273,7 @@ void initialize_keytable(void)
   43.68      open_softirq(KEYPRESS_SOFTIRQ, keypress_softirq);
   43.69  
   43.70      register_irq_keyhandler(
   43.71 -        'd', dump_registers, "dump registers"); 
   43.72 +        'd', dump_registers, "dump registers");
   43.73      register_keyhandler(
   43.74          'h', show_handlers, "show this message");
   43.75      register_keyhandler(
   43.76 @@ -281,7 +281,7 @@ void initialize_keytable(void)
   43.77      register_keyhandler(
   43.78          'r', dump_runq,      "dump run queues");
   43.79      register_irq_keyhandler(
   43.80 -        'R', halt_machine,   "reboot machine"); 
   43.81 +        'R', halt_machine,   "reboot machine");
   43.82  
   43.83      register_keyhandler(
   43.84          't', read_clocks, "display multi-cpu clock info");
   43.85 @@ -295,9 +295,9 @@ void initialize_keytable(void)
   43.86  
   43.87  #ifdef PERF_COUNTERS
   43.88      register_keyhandler(
   43.89 -        'p', perfc_printall, "print performance counters"); 
   43.90 +        'p', perfc_printall, "print performance counters");
   43.91      register_keyhandler(
   43.92 -        'P', perfc_reset,    "reset performance counters"); 
   43.93 +        'P', perfc_reset,    "reset performance counters");
   43.94  #endif
   43.95  
   43.96      register_irq_keyhandler('%', do_debug_key,   "Trap to xendbg");
    44.1 --- a/xen/common/sched_bvt.c	Tue Aug 15 19:53:55 2006 +0100
    44.2 +++ b/xen/common/sched_bvt.c	Wed Aug 16 11:36:13 2006 +0100
    44.3 @@ -382,7 +382,7 @@ static int bvt_adjdom(
    44.4  static struct task_slice bvt_do_schedule(s_time_t now)
    44.5  {
    44.6      struct domain *d;
    44.7 -    struct vcpu      *prev = current, *next = NULL, *next_prime, *ed; 
    44.8 +    struct vcpu      *prev = current, *next = NULL, *next_prime, *ed;
    44.9      int                 cpu = prev->processor;
   44.10      s32                 r_time;     /* time for new dom to run */
   44.11      u32                 next_evt, next_prime_evt, min_avt;
    45.1 --- a/xen/common/sched_sedf.c	Tue Aug 15 19:53:55 2006 +0100
    45.2 +++ b/xen/common/sched_sedf.c	Wed Aug 16 11:36:13 2006 +0100
    45.3 @@ -69,7 +69,7 @@ struct sedf_vcpu_info {
    45.4   
    45.5      /*Advaced Parameters*/
    45.6      /*Latency Scaling*/
    45.7 -    s_time_t  period_orig; 
    45.8 +    s_time_t  period_orig;
    45.9      s_time_t  slice_orig;
   45.10      s_time_t  latency;
   45.11   
   45.12 @@ -87,7 +87,7 @@ struct sedf_vcpu_info {
   45.13      s_time_t  unblock_abs;
   45.14   
   45.15      /*scores for {util, block penalty}-weighted extratime distribution*/
   45.16 -    int   score[2]; 
   45.17 +    int   score[2];
   45.18      s_time_t  short_block_lost_tot;
   45.19   
   45.20      /*Statistics*/
   45.21 @@ -157,7 +157,7 @@ static inline void extraq_del(struct vcp
   45.22      struct list_head *list = EXTRALIST(d,i);
   45.23      ASSERT(extraq_on(d,i));
   45.24      PRINT(3, "Removing domain %i.%i from L%i extraq\n",
   45.25 -          d->domain->domain_id, d->vcpu_id, i); 
   45.26 +          d->domain->domain_id, d->vcpu_id, i);
   45.27      list_del(list);
   45.28      list->next = NULL;
   45.29      ASSERT(!extraq_on(d, i));
   45.30 @@ -179,7 +179,7 @@ static inline void extraq_add_sort_updat
   45.31      PRINT(3, "Adding domain %i.%i (score= %i, short_pen= %"PRIi64")"
   45.32            " to L%i extraq\n",
   45.33            d->domain->domain_id, d->vcpu_id, EDOM_INFO(d)->score[i],
   45.34 -          EDOM_INFO(d)->short_block_lost_tot, i); 
   45.35 +          EDOM_INFO(d)->short_block_lost_tot, i);
   45.36  
   45.37      /*
   45.38       * Iterate through all elements to find our "hole" and on our way
    46.1 --- a/xen/common/schedule.c	Tue Aug 15 19:53:55 2006 +0100
    46.2 +++ b/xen/common/schedule.c	Wed Aug 16 11:36:13 2006 +0100
    46.3 @@ -673,7 +673,7 @@ void dump_runq(unsigned char key)
    46.4  
    46.5      printk("Scheduler: %s (%s)\n", ops.name, ops.opt_name);
    46.6      SCHED_OP(dump_settings);
    46.7 -    printk("NOW=0x%08X%08X\n",  (u32)(now>>32), (u32)now); 
    46.8 +    printk("NOW=0x%08X%08X\n",  (u32)(now>>32), (u32)now);
    46.9  
   46.10      for_each_online_cpu ( i )
   46.11      {
    47.1 --- a/xen/common/timer.c	Tue Aug 15 19:53:55 2006 +0100
    47.2 +++ b/xen/common/timer.c	Wed Aug 16 11:36:13 2006 +0100
    47.3 @@ -343,12 +343,12 @@ static void dump_timerq(unsigned char ke
    47.4  {
    47.5      struct timer  *t;
    47.6      struct timers *ts;
    47.7 -    unsigned long  flags; 
    47.8 +    unsigned long  flags;
    47.9      s_time_t       now = NOW();
   47.10      int            i, j;
   47.11  
   47.12      printk("Dumping timer queues: NOW=0x%08X%08X\n",
   47.13 -           (u32)(now>>32), (u32)now); 
   47.14 +           (u32)(now>>32), (u32)now);
   47.15  
   47.16      for_each_online_cpu( i )
   47.17      {
    48.1 --- a/xen/include/acm/acm_core.h	Tue Aug 15 19:53:55 2006 +0100
    48.2 +++ b/xen/include/acm/acm_core.h	Wed Aug 16 11:36:13 2006 +0100
    48.3 @@ -46,7 +46,7 @@ struct ste_binary_policy {
    48.4      u32 max_ssidrefs;
    48.5      domaintype_t *ssidrefs;     /* [max_ssidrefs][max_types]  */
    48.6      atomic_t ec_eval_count, gt_eval_count;
    48.7 -    atomic_t ec_denied_count, gt_denied_count; 
    48.8 +    atomic_t ec_denied_count, gt_denied_count;
    48.9      atomic_t ec_cachehit_count, gt_cachehit_count;
   48.10  };
   48.11  
    49.1 --- a/xen/include/asm-x86/acpi.h	Tue Aug 15 19:53:55 2006 +0100
    49.2 +++ b/xen/include/asm-x86/acpi.h	Wed Aug 16 11:36:13 2006 +0100
    49.3 @@ -116,7 +116,7 @@ extern int acpi_ht;
    49.4  extern int acpi_pci_disabled;
    49.5  static inline void disable_acpi(void) 
    49.6  { 
    49.7 -	acpi_disabled = 1; 
    49.8 +	acpi_disabled = 1;
    49.9  	acpi_ht = 0;
   49.10  	acpi_pci_disabled = 1;
   49.11  	acpi_noirq = 1;
    50.1 --- a/xen/include/asm-x86/genapic.h	Tue Aug 15 19:53:55 2006 +0100
    50.2 +++ b/xen/include/asm-x86/genapic.h	Wed Aug 16 11:36:13 2006 +0100
    50.3 @@ -18,8 +18,8 @@ struct mp_config_table;
    50.4  struct mpc_config_processor;
    50.5  
    50.6  struct genapic { 
    50.7 -	char *name; 
    50.8 -	int (*probe)(void); 
    50.9 +	char *name;
   50.10 +	int (*probe)(void);
   50.11  
   50.12  	/* When one of the next two hooks returns 1 the genapic
   50.13  	   is switched to this. Essentially they are additional probe 
   50.14 @@ -30,13 +30,13 @@ struct genapic {
   50.15  
   50.16  	/* Interrupt delivery parameters ('physical' vs. 'logical flat'). */
   50.17  	int int_delivery_mode;
   50.18 -	int int_dest_mode; 
   50.19 +	int int_dest_mode;
   50.20  	void (*init_apic_ldr)(void);
   50.21  	void (*clustered_apic_check)(void);
   50.22  	cpumask_t (*target_cpus)(void);
   50.23  	unsigned int (*cpu_mask_to_apicid)(cpumask_t cpumask);
   50.24  	void (*send_IPI_mask)(cpumask_t mask, int vector);
   50.25 -}; 
   50.26 +};
   50.27  
   50.28  #define APICFUNC(x) .x = x
   50.29  
    51.1 --- a/xen/include/asm-x86/hvm/hvm.h	Tue Aug 15 19:53:55 2006 +0100
    51.2 +++ b/xen/include/asm-x86/hvm/hvm.h	Wed Aug 16 11:36:13 2006 +0100
    51.3 @@ -64,8 +64,8 @@ struct hvm_function_table {
    51.4       * 1) TS bit in guest cr0 
    51.5       * 2) TSC offset in guest
    51.6       */
    51.7 -    void (*stts)(struct vcpu *v); 
    51.8 -    void (*set_tsc_offset)(struct vcpu *v, u64 offset); 
    51.9 +    void (*stts)(struct vcpu *v);
   51.10 +    void (*set_tsc_offset)(struct vcpu *v, u64 offset);
   51.11  
   51.12      void (*init_ap_context)(struct vcpu_guest_context *ctxt,
   51.13                              int vcpuid, int trampoline_vector);
   51.14 @@ -150,9 +150,9 @@ hvm_get_guest_ctrl_reg(struct vcpu *v, u
   51.15      return 0;                   /* force to fail */
   51.16  }
   51.17  
   51.18 -extern void hvm_stts(struct vcpu *v); 
   51.19 -extern void hvm_set_guest_time(struct vcpu *v, u64 gtime); 
   51.20 -extern void hvm_do_resume(struct vcpu *v); 
   51.21 +extern void hvm_stts(struct vcpu *v);
   51.22 +extern void hvm_set_guest_time(struct vcpu *v, u64 gtime);
   51.23 +extern void hvm_do_resume(struct vcpu *v);
   51.24  
   51.25  static inline void
   51.26  hvm_init_ap_context(struct vcpu_guest_context *ctxt,
    52.1 --- a/xen/include/asm-x86/hvm/svm/vmcb.h	Tue Aug 15 19:53:55 2006 +0100
    52.2 +++ b/xen/include/asm-x86/hvm/svm/vmcb.h	Wed Aug 16 11:36:13 2006 +0100
    52.3 @@ -308,7 +308,7 @@ typedef union
    52.4          u64 ev:        1;
    52.5          u64 resvd1:   19;
    52.6          u64 v:         1;
    52.7 -        u64 errorcode:32; 
    52.8 +        u64 errorcode:32;
    52.9      } fields;
   52.10  } __attribute__ ((packed)) eventinj_t;
   52.11  
    53.1 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h	Tue Aug 15 19:53:55 2006 +0100
    53.2 +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h	Wed Aug 16 11:36:13 2006 +0100
    53.3 @@ -27,7 +27,7 @@
    53.4  extern int start_vmx(void);
    53.5  extern void vmcs_dump_vcpu(void);
    53.6  extern void vmx_init_vmcs_config(void);
    53.7 -extern void setup_vmcs_dump(void); 
    53.8 +extern void setup_vmcs_dump(void);
    53.9  
   53.10  enum {
   53.11      VMX_CPU_STATE_PAE_ENABLED=0,
    54.1 --- a/xen/include/asm-x86/mach-es7000/mach_mpparse.h	Tue Aug 15 19:53:55 2006 +0100
    54.2 +++ b/xen/include/asm-x86/mach-es7000/mach_mpparse.h	Wed Aug 16 11:36:13 2006 +0100
    54.3 @@ -32,7 +32,7 @@ static inline int es7000_check_dsdt(void
    54.4  /* Hook from generic ACPI tables.c */
    54.5  static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id)
    54.6  {
    54.7 -	unsigned long oem_addr; 
    54.8 +	unsigned long oem_addr;
    54.9  	if (!find_unisys_acpi_oem_table(&oem_addr)) {
   54.10  		if (es7000_check_dsdt())
   54.11  			return parse_unisys_oem((char *)oem_addr);
    55.1 --- a/xen/include/asm-x86/mach-generic/mach_mpparse.h	Tue Aug 15 19:53:55 2006 +0100
    55.2 +++ b/xen/include/asm-x86/mach-generic/mach_mpparse.h	Wed Aug 16 11:36:13 2006 +0100
    55.3 @@ -12,7 +12,7 @@ static inline void mpc_oem_pci_bus(struc
    55.4  {
    55.5  }
    55.6  
    55.7 -int mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid); 
    55.8 -int acpi_madt_oem_check(char *oem_id, char *oem_table_id); 
    55.9 +int mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid);
   55.10 +int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
   55.11  
   55.12  #endif
    56.1 --- a/xen/include/asm-x86/msr.h	Tue Aug 15 19:53:55 2006 +0100
    56.2 +++ b/xen/include/asm-x86/msr.h	Wed Aug 16 11:36:13 2006 +0100
    56.3 @@ -13,7 +13,7 @@
    56.4  			    : "=a" (a__), "=d" (b__) \
    56.5  			    : "c" (msr)); \
    56.6         val = a__ | ((u64)b__<<32); \
    56.7 -} while(0); 
    56.8 +} while(0);
    56.9  
   56.10  #define wrmsr(msr,val1,val2) \
   56.11       __asm__ __volatile__("wrmsr" \
    57.1 --- a/xen/include/asm-x86/processor.h	Tue Aug 15 19:53:55 2006 +0100
    57.2 +++ b/xen/include/asm-x86/processor.h	Wed Aug 16 11:36:13 2006 +0100
    57.3 @@ -280,26 +280,26 @@ static always_inline unsigned int cpuid_
    57.4  
    57.5  static inline unsigned long read_cr0(void)
    57.6  {
    57.7 -	unsigned long __cr0;
    57.8 -	__asm__("mov %%cr0,%0\n\t" :"=r" (__cr0)); 
    57.9 -    return __cr0; 
   57.10 +    unsigned long __cr0;
   57.11 +    __asm__("mov %%cr0,%0\n\t" :"=r" (__cr0));
   57.12 +    return __cr0;
   57.13  } 
   57.14  
   57.15  static inline void write_cr0(unsigned long val)
   57.16  {
   57.17 -	__asm__("mov %0,%%cr0": :"r" ((unsigned long)val)); 
   57.18 +	__asm__("mov %0,%%cr0": :"r" ((unsigned long)val));
   57.19  }
   57.20  
   57.21  static inline unsigned long read_cr4(void)
   57.22  {
   57.23 -	unsigned long __cr4;
   57.24 -	__asm__("mov %%cr4,%0\n\t" :"=r" (__cr4)); 
   57.25 -    return __cr4; 
   57.26 +    unsigned long __cr4;
   57.27 +    __asm__("mov %%cr4,%0\n\t" :"=r" (__cr4));
   57.28 +    return __cr4;
   57.29  } 
   57.30      
   57.31  static inline void write_cr4(unsigned long val)
   57.32  {
   57.33 -	__asm__("mov %0,%%cr4": :"r" ((unsigned long)val)); 
   57.34 +	__asm__("mov %0,%%cr4": :"r" ((unsigned long)val));
   57.35  }
   57.36  
   57.37  
    58.1 --- a/xen/include/asm-x86/shadow.h	Tue Aug 15 19:53:55 2006 +0100
    58.2 +++ b/xen/include/asm-x86/shadow.h	Wed Aug 16 11:36:13 2006 +0100
    58.3 @@ -1136,7 +1136,7 @@ static void shadow_audit(struct domain *
    58.4          a = a->next;
    58.5          while ( a && (live < 9999) )
    58.6          { 
    58.7 -            live++; 
    58.8 +            live++;
    58.9              if ( (a->gpfn_and_flags == 0) || (a->smfn == 0) )
   58.10              {
   58.11                  printk("XXX live=%d gpfn+flags=%lx sp=%lx next=%p\n",
   58.12 @@ -1144,13 +1144,13 @@ static void shadow_audit(struct domain *
   58.13                  BUG();
   58.14              }
   58.15              ASSERT(a->smfn);
   58.16 -            a = a->next; 
   58.17 +            a = a->next;
   58.18          }
   58.19          ASSERT(live < 9999);
   58.20      }
   58.21  
   58.22      for ( a = d->arch.shadow_ht_free; a != NULL; a = a->next )
   58.23 -        free++; 
   58.24 +        free++;
   58.25  
   58.26      if ( print )
   58.27          printk("Xlive=%d free=%d\n", live, free);
   58.28 @@ -1731,7 +1731,7 @@ static inline unsigned long gva_to_gpa(u
   58.29      if ( !(l1e_get_flags(gpte) & _PAGE_PRESENT) )
   58.30          return 0;
   58.31  
   58.32 -    return l1e_get_paddr(gpte) + (gva & ~PAGE_MASK); 
   58.33 +    return l1e_get_paddr(gpte) + (gva & ~PAGE_MASK);
   58.34  }
   58.35  #endif
   58.36  
    59.1 --- a/xen/include/asm-x86/shadow_64.h	Tue Aug 15 19:53:55 2006 +0100
    59.2 +++ b/xen/include/asm-x86/shadow_64.h	Wed Aug 16 11:36:13 2006 +0100
    59.3 @@ -139,7 +139,7 @@ static inline int  table_offset_64(unsig
    59.4  #endif
    59.5  #else
    59.6          case 4:
    59.7 -            return PAE_SHADOW_SELF_ENTRY; 
    59.8 +            return PAE_SHADOW_SELF_ENTRY;
    59.9  #endif
   59.10  #endif
   59.11          default:
    60.1 --- a/xen/include/asm-x86/string.h	Tue Aug 15 19:53:55 2006 +0100
    60.2 +++ b/xen/include/asm-x86/string.h	Wed Aug 16 11:36:13 2006 +0100
    60.3 @@ -140,7 +140,7 @@ static inline void *__constant_c_memset(
    60.4          : "a" (c), "r" (count%BYTES_PER_LONG),
    60.5            "0" (count/BYTES_PER_LONG), "1" (s)
    60.6          : "memory" );
    60.7 -    return s; 
    60.8 +    return s;
    60.9  }
   60.10  
   60.11  /*
    61.1 --- a/xen/include/asm-x86/uaccess.h	Tue Aug 15 19:53:55 2006 +0100
    61.2 +++ b/xen/include/asm-x86/uaccess.h	Wed Aug 16 11:36:13 2006 +0100
    61.3 @@ -14,8 +14,8 @@
    61.4  #include <asm/x86_32/uaccess.h>
    61.5  #endif
    61.6  
    61.7 -unsigned long copy_to_user(void *to, const void *from, unsigned len); 
    61.8 -unsigned long copy_from_user(void *to, const void *from, unsigned len); 
    61.9 +unsigned long copy_to_user(void *to, const void *from, unsigned len);
   61.10 +unsigned long copy_from_user(void *to, const void *from, unsigned len);
   61.11  /* Handles exceptions in both to and from, but doesn't do access_ok */
   61.12  unsigned long __copy_to_user_ll(void *to, const void *from, unsigned n);
   61.13  unsigned long __copy_from_user_ll(void *to, const void *from, unsigned n);
   61.14 @@ -251,7 +251,7 @@ static always_inline unsigned long
   61.15              return ret;
   61.16          case 8:
   61.17              __get_user_size(*(u64*)to, from, 8, ret, 8);
   61.18 -            return ret; 
   61.19 +            return ret;
   61.20          }
   61.21      }
   61.22      return __copy_from_user_ll(to, from, n);
    62.1 --- a/xen/include/xen/gdbstub.h	Tue Aug 15 19:53:55 2006 +0100
    62.2 +++ b/xen/include/xen/gdbstub.h	Wed Aug 16 11:36:13 2006 +0100
    62.3 @@ -27,10 +27,10 @@
    62.4  #ifdef CRASH_DEBUG
    62.5  
    62.6  /* value <-> char (de)serialzers for arch specific gdb backends */
    62.7 -char hex2char(unsigned long x); 
    62.8 -int char2hex(unsigned char c); 
    62.9 -char str2hex(const char *str); 
   62.10 -unsigned long str2ulong(const char *str, unsigned long bytes); 
   62.11 +char hex2char(unsigned long x);
   62.12 +int char2hex(unsigned char c);
   62.13 +char str2hex(const char *str);
   62.14 +unsigned long str2ulong(const char *str, unsigned long bytes);
   62.15  
   62.16  struct gdb_context {
   62.17      int                 serhnd;
   62.18 @@ -52,7 +52,7 @@ void gdb_write_to_packet(
   62.19      const char *buf, int count, struct gdb_context *ctx);
   62.20  void gdb_write_to_packet_hex(
   62.21      unsigned long x, int int_size, struct gdb_context *ctx);
   62.22 -void gdb_send_packet(struct gdb_context *ctx); 
   62.23 +void gdb_send_packet(struct gdb_context *ctx);
   62.24  void gdb_send_reply(const char *buf, struct gdb_context *ctx);
   62.25  
   62.26  /* gdb stub trap handler: entry point */
    63.1 --- a/xen/include/xen/keyhandler.h	Tue Aug 15 19:53:55 2006 +0100
    63.2 +++ b/xen/include/xen/keyhandler.h	Wed Aug 16 11:36:13 2006 +0100
    63.3 @@ -1,7 +1,7 @@
    63.4  /******************************************************************************
    63.5   * keyhandler.h
    63.6   * 
    63.7 - * We keep an array of 'handlers' for each key code between 0 and 255; 
    63.8 + * We keep an array of 'handlers' for each key code between 0 and 255;
    63.9   * this is intended to allow very simple debugging routines (toggle 
   63.10   * debug flag, dump registers, reboot, etc) to be hooked in in a slightly
   63.11   * nicer fashion than just editing the serial/keyboard drivers. 
   63.12 @@ -16,7 +16,7 @@
   63.13   */
   63.14  typedef void keyhandler_t(unsigned char key);
   63.15  extern void register_keyhandler(
   63.16 -    unsigned char key, keyhandler_t *handler, char *desc); 
   63.17 +    unsigned char key, keyhandler_t *handler, char *desc);
   63.18  
   63.19  /*
   63.20   * Register an IRQ callback function for key @key. The callback occurs
   63.21 @@ -25,7 +25,7 @@ extern void register_keyhandler(
   63.22   */
   63.23  typedef void irq_keyhandler_t(unsigned char key, struct cpu_user_regs *regs);
   63.24  extern void register_irq_keyhandler(
   63.25 -    unsigned char key, irq_keyhandler_t *handler, char *desc); 
   63.26 +    unsigned char key, irq_keyhandler_t *handler, char *desc);
   63.27  
   63.28  /* Inject a keypress into the key-handling subsystem. */
   63.29  extern void handle_keypress(unsigned char key, struct cpu_user_regs *regs);
    64.1 --- a/xen/include/xen/list.h	Tue Aug 15 19:53:55 2006 +0100
    64.2 +++ b/xen/include/xen/list.h	Wed Aug 16 11:36:13 2006 +0100
    64.3 @@ -101,7 +101,7 @@ static __inline__ void list_del(struct l
    64.4  static __inline__ void list_del_init(struct list_head *entry)
    64.5  {
    64.6  	__list_del(entry->prev, entry->next);
    64.7 -	INIT_LIST_HEAD(entry); 
    64.8 +	INIT_LIST_HEAD(entry);
    64.9  }
   64.10  
   64.11  /**