diff options
64 files changed, 160 insertions, 164 deletions
diff --git a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c index 08ad6fd2b6..98c76515d0 100644 --- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c +++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c @@ -76,7 +76,7 @@ static unsigned long current_pages; static unsigned long target_pages; /* We increase/decrease in batches which fit in a page */ -static unsigned long frame_list[PAGE_SIZE / sizeof(unsigned long)]; +static unsigned long frame_list[PAGE_SIZE / sizeof(unsigned long)]; /* VM /proc information for memory */ extern unsigned long totalram_pages; diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c index 29ee1c4b1e..416f7bc18c 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c @@ -341,7 +341,7 @@ static void dispatch_rw_block_io(blkif_t *blkif, blkif_request_t *req, pending_req_t *pending_req) { - extern void ll_rw_block(int rw, int nr, struct buffer_head * bhs[]); + extern void ll_rw_block(int rw, int nr, struct buffer_head * bhs[]); int operation = (req->operation == BLKIF_OP_WRITE) ? WRITE : READ; struct gnttab_map_grant_ref map[BLKIF_MAX_SEGMENTS_PER_REQUEST]; struct phys_req preq; @@ -409,7 +409,7 @@ static void dispatch_rw_block_io(blkif_t *blkif, DPRINTK("access denied: %s of [%llu,%llu] on dev=%04x\n", operation == READ ? "read" : "write", preq.sector_number, - preq.sector_number + preq.nr_sects, preq.dev); + preq.sector_number + preq.nr_sects, preq.dev); goto fail_flush; } diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/common.h b/linux-2.6-xen-sparse/drivers/xen/blkback/common.h index d057f79242..38cb756964 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/common.h +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/common.h @@ -55,9 +55,9 @@ struct vbd { unsigned char type; /* VDISK_xxx */ u32 pdevice; /* phys device that this vbd maps to */ struct block_device *bdev; -}; +}; -struct backend_info; +struct backend_info; typedef struct blkif_st { /* Unique identifier for this interface. */ @@ -72,7 +72,7 @@ typedef struct blkif_st { /* The VBD attached to this interface. */ struct vbd vbd; /* Back pointer to the backend_info. */ - struct backend_info *be; + struct backend_info *be; /* Private fields. */ spinlock_t blk_ring_lock; atomic_t refcnt; @@ -122,7 +122,7 @@ struct phys_req { blkif_sector_t sector_number; }; -int vbd_translate(struct phys_req *req, blkif_t *blkif, int operation); +int vbd_translate(struct phys_req *req, blkif_t *blkif, int operation); void blkif_interface_init(void); diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c b/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c index 59d93242b5..ca01d15595 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c @@ -194,7 +194,7 @@ static int blkback_probe(struct xenbus_device *dev, } /* setup back pointer */ - be->blkif->be = be; + be->blkif->be = be; err = xenbus_watch_path2(dev, dev->nodename, "physical-device", &be->backend_watch, backend_changed); @@ -287,7 +287,7 @@ static void backend_changed(struct xenbus_watch *watch, } /* We're potentially connected now */ - update_blkif_status(be->blkif); + update_blkif_status(be->blkif); } } diff --git a/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c b/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c index 8c5cf68d7f..ade3c50dec 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c +++ b/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c @@ -157,7 +157,7 @@ static int alloc_pending_reqs; typedef unsigned int PEND_RING_IDX; static inline int MASK_PEND_IDX(int i) { - return (i & (MAX_PENDING_REQS-1)); + return (i & (MAX_PENDING_REQS-1)); } static inline unsigned int RTN_PEND_IDX(pending_req_t *req, int idx) { @@ -754,7 +754,7 @@ static int req_increase(void) if (!pending_reqs[mmap_alloc] || !pending_addrs[mmap_alloc]) { kfree(pending_reqs[mmap_alloc]); kfree(pending_addrs[mmap_alloc]); - WPRINTK("%s: out of memory\n", __FUNCTION__); + WPRINTK("%s: out of memory\n", __FUNCTION__); ret = -ENOMEM; goto done; } @@ -1051,7 +1051,7 @@ static int blktap_read_ufe_ring(int idx) unsigned long kvaddr, uvaddr; struct page **map = info->vma->vm_private_data; struct page *pg; - int offset; + int offset; uvaddr = MMAP_VADDR(info->user_vstart, usr_idx, j); kvaddr = MMAP_VADDR(mmap_start[mmap_idx].start, @@ -1063,7 +1063,7 @@ static int blktap_read_ufe_ring(int idx) >> PAGE_SHIFT; map[offset] = NULL; } - fast_flush_area(pending_req, pending_idx, usr_idx, idx); + fast_flush_area(pending_req, pending_idx, usr_idx, idx); make_response(blkif, pending_req->id, resp->operation, resp->status); info->idx_map[usr_idx] = INVALID_REQ; @@ -1118,7 +1118,7 @@ static int do_block_io_op(blkif_t *blkif) "ring does not exist!\n"); print_dbug = 0; /*We only print this message once*/ } - return 1; + return 1; } info = tapfds[blkif->dev_num]; @@ -1185,7 +1185,7 @@ static void dispatch_rw_block_io(blkif_t *blkif, blkif_request_t *req, pending_req_t *pending_req) { - extern void ll_rw_block(int rw, int nr, struct buffer_head * bhs[]); + extern void ll_rw_block(int rw, int nr, struct buffer_head * bhs[]); int op, operation = (req->operation == BLKIF_OP_WRITE) ? WRITE : READ; struct gnttab_map_grant_ref map[BLKIF_MAX_SEGMENTS_PER_REQUEST*2]; unsigned int nseg; diff --git a/linux-2.6-xen-sparse/drivers/xen/blktap/common.h b/linux-2.6-xen-sparse/drivers/xen/blktap/common.h index 975674f0dd..e610bed9e4 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blktap/common.h +++ b/linux-2.6-xen-sparse/drivers/xen/blktap/common.h @@ -49,7 +49,7 @@ #define WPRINTK(fmt, args...) printk(KERN_WARNING "blk_tap: " fmt, ##args) -struct backend_info; +struct backend_info; typedef struct blkif_st { /* Unique identifier for this interface. */ @@ -62,7 +62,7 @@ typedef struct blkif_st { blkif_back_ring_t blk_ring; struct vm_struct *blk_ring_area; /* Back pointer to the backend_info. */ - struct backend_info *be; + struct backend_info *be; /* Private fields. */ spinlock_t blk_ring_lock; atomic_t refcnt; diff --git a/linux-2.6-xen-sparse/drivers/xen/blktap/xenbus.c b/linux-2.6-xen-sparse/drivers/xen/blktap/xenbus.c index b1ad47b529..1b901f5b0c 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blktap/xenbus.c +++ b/linux-2.6-xen-sparse/drivers/xen/blktap/xenbus.c @@ -174,7 +174,7 @@ static int blktap_probe(struct xenbus_device *dev, } /* setup back pointer */ - be->blkif->be = be; + be->blkif->be = be; be->blkif->sectors = 0; /* set a watch on disk info, waiting for userspace to update details*/ diff --git a/linux-2.6-xen-sparse/drivers/xen/netback/common.h b/linux-2.6-xen-sparse/drivers/xen/netback/common.h index c5ec30071a..ffea3b6845 100644 --- a/linux-2.6-xen-sparse/drivers/xen/netback/common.h +++ b/linux-2.6-xen-sparse/drivers/xen/netback/common.h @@ -64,9 +64,9 @@ typedef struct netif_st { /* Physical parameters of the comms window. */ grant_handle_t tx_shmem_handle; - grant_ref_t tx_shmem_ref; + grant_ref_t tx_shmem_ref; grant_handle_t rx_shmem_handle; - grant_ref_t rx_shmem_ref; + grant_ref_t rx_shmem_ref; unsigned int evtchn; unsigned int irq; diff --git a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c index 8d8e71bca9..90f03326ef 100644 --- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c +++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c @@ -328,7 +328,7 @@ static void xen_network_done_notify(void) /* * Add following to poll() function in NAPI driver (Tigon3 is example): * if ( xen_network_done() ) - * tg3_enable_ints(tp); + * tg3_enable_ints(tp); */ int xen_network_done(void) { @@ -478,7 +478,7 @@ static void netbk_add_frag_responses(netif_t *netif, int status, static void net_rx_action(unsigned long unused) { - netif_t *netif = NULL; + netif_t *netif = NULL; s8 status; u16 id, irq, flags; netif_rx_response_t *resp; @@ -1095,7 +1095,7 @@ static void net_tx_action(unsigned long unused) if (unlikely(txreq.size < ETH_HLEN)) { DPRINTK("Bad packet size: %d\n", txreq.size); netbk_tx_err(netif, &txreq, i); - continue; + continue; } /* No crossing a page as the payload mustn't fragment. */ diff --git a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c index 9f03eae6e4..173c25042d 100644 --- a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c +++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c @@ -162,7 +162,7 @@ static int privcmd_ioctl(struct inode *inode, struct file *file, privcmd_mmapbatch_t m; struct vm_area_struct *vma = NULL; xen_pfn_t __user *p; - unsigned long addr, mfn; + unsigned long addr, mfn; int i; if (copy_from_user(&m, udata, sizeof(m))) { diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c index a8b9391e08..3decb3d2bc 100644 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c @@ -844,7 +844,7 @@ static int resume_dev(struct device *dev, void *data) printk(KERN_WARNING "xenbus: resume %s failed: %i\n", dev->bus_id, err); - return err; + return err; } } @@ -856,7 +856,7 @@ static int resume_dev(struct device *dev, void *data) return err; } - return 0; + return 0; } void xenbus_suspend(void) diff --git a/xen/acm/acm_core.c b/xen/acm/acm_core.c index 0246ff3b0f..bafb177c3d 100644 --- a/xen/acm/acm_core.c +++ b/xen/acm/acm_core.c @@ -206,7 +206,7 @@ acm_setup(unsigned int *initrdidx, for (i = mbi->mods_count-1; i >= 1; i--) { struct acm_policy_buffer *pol; - char *_policy_start; + char *_policy_start; unsigned long _policy_len; #if defined(__i386__) _policy_start = (char *)(initial_images_start + (mod[i].mod_start-mod[0].mod_start)); @@ -342,7 +342,7 @@ acm_init_domain_ssid(domid_t id, ssidref_t ssidref) { printk("%s: ERROR instantiating individual ssids for domain 0x%02x.\n", __func__, subj->domain_id); - acm_free_domain_ssid(ssid); + acm_free_domain_ssid(ssid); put_domain(subj); return ACM_INIT_SSID_ERROR; } diff --git a/xen/acm/acm_simple_type_enforcement_hooks.c b/xen/acm/acm_simple_type_enforcement_hooks.c index f4f8bbc9b9..dd732e7793 100644 --- a/xen/acm/acm_simple_type_enforcement_hooks.c +++ b/xen/acm/acm_simple_type_enforcement_hooks.c @@ -86,10 +86,10 @@ int acm_init_ste_policy(void) /* init stats */ atomic_set(&(ste_bin_pol.ec_eval_count), 0); - atomic_set(&(ste_bin_pol.ec_denied_count), 0); + atomic_set(&(ste_bin_pol.ec_denied_count), 0); atomic_set(&(ste_bin_pol.ec_cachehit_count), 0); atomic_set(&(ste_bin_pol.gt_eval_count), 0); - atomic_set(&(ste_bin_pol.gt_denied_count), 0); + atomic_set(&(ste_bin_pol.gt_denied_count), 0); atomic_set(&(ste_bin_pol.gt_cachehit_count), 0); return ACM_OK; } @@ -100,7 +100,7 @@ static int ste_init_domain_ssid(void **ste_ssid, ssidref_t ssidref) { int i; - struct ste_ssid *ste_ssidp = xmalloc(struct ste_ssid); + struct ste_ssid *ste_ssidp = xmalloc(struct ste_ssid); traceprintk("%s.\n", __func__); if (ste_ssidp == NULL) @@ -309,7 +309,7 @@ ste_set_policy(u8 *buf, u32 buf_size) sizeof(domaintype_t), ste_buf->ste_max_ssidrefs*ste_buf->ste_max_types); - /* 2. now re-calculate sharing decisions based on running domains; + /* 2. now re-calculate sharing decisions based on running domains; * this can fail if new policy is conflicting with sharing of running domains * now: reject violating new policy; future: adjust sharing through revoking sharing */ if (ste_init_state(ste_buf, (domaintype_t *)ssidrefsbuf)) { @@ -349,11 +349,11 @@ ste_dump_stats(u8 *buf, u16 buf_len) stats.ec_eval_count = htonl(atomic_read(&ste_bin_pol.ec_eval_count)); stats.gt_eval_count = htonl(atomic_read(&ste_bin_pol.gt_eval_count)); stats.ec_denied_count = htonl(atomic_read(&ste_bin_pol.ec_denied_count)); - stats.gt_denied_count = htonl(atomic_read(&ste_bin_pol.gt_denied_count)); + stats.gt_denied_count = htonl(atomic_read(&ste_bin_pol.gt_denied_count)); stats.ec_cachehit_count = htonl(atomic_read(&ste_bin_pol.ec_cachehit_count)); stats.gt_cachehit_count = htonl(atomic_read(&ste_bin_pol.gt_cachehit_count)); - if (buf_len < sizeof(struct acm_ste_stats_buffer)) + if (buf_len < sizeof(struct acm_ste_stats_buffer) return -ENOMEM; memcpy(buf, &stats, sizeof(struct acm_ste_stats_buffer)); @@ -523,8 +523,8 @@ ste_pre_eventchannel_unbound(domid_t id1, domid_t id2) { cache_result(subj, obj); ret = ACM_ACCESS_PERMITTED; } else { - atomic_inc(&ste_bin_pol.ec_denied_count); - ret = ACM_ACCESS_DENIED; + atomic_inc(&ste_bin_pol.ec_denied_count); + ret = ACM_ACCESS_DENIED; } out: if (obj != NULL) @@ -569,8 +569,8 @@ ste_pre_eventchannel_interdomain(domid_t id) cache_result(subj, obj); ret = ACM_ACCESS_PERMITTED; } else { - atomic_inc(&ste_bin_pol.ec_denied_count); - ret = ACM_ACCESS_DENIED; + atomic_inc(&ste_bin_pol.ec_denied_count); + ret = ACM_ACCESS_DENIED; } out: if (obj != NULL) @@ -599,9 +599,9 @@ ste_pre_grant_map_ref (domid_t id) { cache_result(subj, obj); ret = ACM_ACCESS_PERMITTED; } else { - atomic_inc(&ste_bin_pol.gt_denied_count); + atomic_inc(&ste_bin_pol.gt_denied_count); printkd("%s: ACCESS DENIED!\n", __func__); - ret = ACM_ACCESS_DENIED; + ret = ACM_ACCESS_DENIED; } if (obj != NULL) put_domain(obj); @@ -637,8 +637,8 @@ ste_pre_grant_setup (domid_t id) { cache_result(subj, obj); ret = ACM_ACCESS_PERMITTED; } else { - atomic_inc(&ste_bin_pol.gt_denied_count); - ret = ACM_ACCESS_DENIED; + atomic_inc(&ste_bin_pol.gt_denied_count); + ret = ACM_ACCESS_DENIED; } if (obj != NULL) put_domain(obj); diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index aa4b5ceaa2..11bd6e14b4 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -107,7 +107,7 @@ char *__acpi_map_table(unsigned long phys, unsigned long size) int idx; if (phys + size < 8 * 1024 * 1024) - return __va(phys); + return __va(phys); offset = phys & (PAGE_SIZE - 1); mapped_size = PAGE_SIZE - offset; diff --git a/xen/arch/x86/audit.c b/xen/arch/x86/audit.c index 2e31ad4732..bacdb9cc50 100644 --- a/xen/arch/x86/audit.c +++ b/xen/arch/x86/audit.c @@ -63,7 +63,7 @@ int audit_adjust_pgtables(struct domain *d, int dir, int noisy) /* 32b PAE */ if ( (( mfn_to_page(mfn)->u.inuse.type_info & PGT_va_mask ) >> PGT_va_shift) == 3 ) - return l2_table_offset(HYPERVISOR_VIRT_START); + return l2_table_offset(HYPERVISOR_VIRT_START); else return L2_PAGETABLE_ENTRIES; #else diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 80e3e6f4fd..300638fb37 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -280,7 +280,7 @@ static void __init init_amd(struct cpuinfo_x86 *c) set_bit(X86_FEATURE_K8, c->x86_capability); break; case 6: - set_bit(X86_FEATURE_K7, c->x86_capability); + set_bit(X86_FEATURE_K7, c->x86_capability); break; } diff --git a/xen/arch/x86/cpu/cyrix.c b/xen/arch/x86/cpu/cyrix.c index 6a3b98ea71..d44f6e890e 100644 --- a/xen/arch/x86/cpu/cyrix.c +++ b/xen/arch/x86/cpu/cyrix.c @@ -145,7 +145,7 @@ static void __init set_cx86_inc(void) setCx86(CX86_PCR1, getCx86(CX86_PCR1) | 0x02); /* PCR0 -- Performance Control */ /* Incrementor Margin 10 */ - setCx86(CX86_PCR0, getCx86(CX86_PCR0) | 0x04); + setCx86(CX86_PCR0, getCx86(CX86_PCR0) | 0x04); setCx86(CX86_CCR3, ccr3); /* disable MAPEN */ } diff --git a/xen/arch/x86/cpu/transmeta.c b/xen/arch/x86/cpu/transmeta.c index c296006256..76b8105006 100644 --- a/xen/arch/x86/cpu/transmeta.c +++ b/xen/arch/x86/cpu/transmeta.c @@ -19,7 +19,7 @@ static void __init init_transmeta(struct cpuinfo_x86 *c) max = cpuid_eax(0x80860000); cpu_rev = 0; if ( max >= 0x80860001 ) { - cpuid(0x80860001, &dummy, &cpu_rev, &cpu_freq, &cpu_flags); + cpuid(0x80860001, &dummy, &cpu_rev, &cpu_freq, &cpu_flags); if (cpu_rev != 0x02000000) { printk(KERN_INFO "CPU: Processor revision %u.%u.%u.%u, %u MHz\n", (cpu_rev >> 24) & 0xff, diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c index 74a487aade..89b65b7a3c 100644 --- a/xen/arch/x86/dmi_scan.c +++ b/xen/arch/x86/dmi_scan.c @@ -199,11 +199,11 @@ extern int acpi_force; static __init __attribute__((unused)) int dmi_disable_acpi(struct dmi_blacklist *d) { if (!acpi_force) { - printk(KERN_NOTICE "%s detected: acpi off\n",d->ident); + printk(KERN_NOTICE "%s detected: acpi off\n",d->ident); disable_acpi(); } else { printk(KERN_NOTICE - "Warning: DMI blacklist says broken, but acpi forced\n"); + "Warning: DMI blacklist says broken, but acpi forced\n"); } return 0; } @@ -214,12 +214,12 @@ static __init __attribute__((unused)) int dmi_disable_acpi(struct dmi_blacklist static __init __attribute__((unused)) int force_acpi_ht(struct dmi_blacklist *d) { if (!acpi_force) { - printk(KERN_NOTICE "%s detected: force use of acpi=ht\n", d->ident); + printk(KERN_NOTICE "%s detected: force use of acpi=ht\n", d->ident); disable_acpi(); - acpi_ht = 1; + acpi_ht = 1; } else { printk(KERN_NOTICE - "Warning: acpi=force overrules DMI blacklist: acpi=ht\n"); + "Warning: acpi=force overrules DMI blacklist: acpi=ht\n"); } return 0; } diff --git a/xen/arch/x86/dom0_ops.c b/xen/arch/x86/dom0_ops.c index e9c015fd0b..214b0c58f8 100644 --- a/xen/arch/x86/dom0_ops.c +++ b/xen/arch/x86/dom0_ops.c @@ -84,7 +84,7 @@ long arch_do_dom0_op(struct dom0_op *op, XEN_GUEST_HANDLE(dom0_op_t) u_dom0_op) case DOM0_SHADOW_CONTROL: { - struct domain *d; + struct domain *d; ret = -ESRCH; d = find_domain_by_id(op->u.shadow_control.domain); if ( d != NULL ) diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 4e274cc65d..a1d95f77c6 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -469,7 +469,7 @@ int construct_dom0(struct domain *d, { if ( !((unsigned long)l1tab & (PAGE_SIZE-1)) ) { - l1start = l1tab = (l1_pgentry_t *)mpt_alloc; + l1start = l1tab = (l1_pgentry_t *)mpt_alloc; mpt_alloc += PAGE_SIZE; *l2tab = l2e_from_paddr((unsigned long)l1start, L2_PROT); l2tab++; @@ -661,7 +661,7 @@ int construct_dom0(struct domain *d, if ( !((unsigned long)++l2tab & (PAGE_SIZE - 1)) ) { if ( !((unsigned long)++l3tab & (PAGE_SIZE - 1)) ) - l3start = l3tab = l4e_to_l3e(*++l4tab); + l3start = l3tab = l4e_to_l3e(*++l4tab); l2start = l2tab = l3e_to_l2e(*l3tab); } l1start = l1tab = l2e_to_l1e(*l2tab); diff --git a/xen/arch/x86/genapic/bigsmp.c b/xen/arch/x86/genapic/bigsmp.c index ae714a8282..fb0a4d433b 100644 --- a/xen/arch/x86/genapic/bigsmp.c +++ b/xen/arch/x86/genapic/bigsmp.c @@ -41,7 +41,7 @@ static __init int probe_bigsmp(void) dmi_bigsmp = 1; else dmi_check_system(bigsmp_dmi_table); - return dmi_bigsmp; + return dmi_bigsmp; } struct genapic apic_bigsmp = { diff --git a/xen/arch/x86/genapic/es7000.h b/xen/arch/x86/genapic/es7000.h index f1e3204f5d..aeaeb7e7d8 100644 --- a/xen/arch/x86/genapic/es7000.h +++ b/xen/arch/x86/genapic/es7000.h @@ -71,8 +71,8 @@ struct es7000_mem_info { unsigned char type; unsigned char length; unsigned char resv[6]; - unsigned long long start; - unsigned long long size; + unsigned long long start; + unsigned long long size; }; struct es7000_oem_table { diff --git a/xen/arch/x86/genapic/probe.c b/xen/arch/x86/genapic/probe.c index 30d89c27fe..324594bc56 100644 --- a/xen/arch/x86/genapic/probe.c +++ b/xen/arch/x86/genapic/probe.c @@ -65,7 +65,7 @@ void __init generic_apic_probe(void) for (i = 0; !changed && apic_probe[i]; i++) { if (apic_probe[i]->probe()) { changed = 1; - genapic = apic_probe[i]; + genapic = apic_probe[i]; } } if (!changed) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 3f6c66407c..9f46235463 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -981,7 +981,7 @@ static void svm_do_general_protection_fault(struct vcpu *v, printf("Huh? We got a GP Fault with an invalid IDTR!\n"); svm_dump_vmcb(__func__, vmcb); svm_dump_regs(__func__, regs); - svm_dump_inst(vmcb->rip); + svm_dump_inst(vmcb->rip); __hvm_bug(regs); } @@ -1267,7 +1267,7 @@ static void svm_dr_access (struct vcpu *v, unsigned int reg, unsigned int type, { case TYPE_MOV_TO_DR: inst_len = __get_instruction_length(vmcb, INSTR_MOV2DR, buffer); - v->arch.guest_context.debugreg[reg] = *reg_p; + v->arch.guest_context.debugreg[reg] = *reg_p; break; case TYPE_MOV_FROM_DR: inst_len = __get_instruction_length(vmcb, INSTR_MOVDR2, buffer); diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index e2b11730ed..6ed5a6ab94 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -309,10 +309,6 @@ int construct_vmcb(struct arch_svm_struct *arch_svm, goto err_out; } - /* update the HSA for the current Core */ -#if 0 - set_hsa_to_guest( arch_svm ); -#endif arch_svm->vmcb_pa = (u64) virt_to_maddr(arch_svm->vmcb); if ((error = construct_vmcb_controls(arch_svm))) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index a9eb5a8884..c25f6b5d27 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -639,7 +639,7 @@ static int pin_2_irq(int idx, int apic, int pin) } default: { - printk(KERN_ERR "unknown bus type %d.\n",bus); + printk(KERN_ERR "unknown bus type %d.\n",bus); irq = 0; break; } diff --git a/xen/arch/x86/microcode.c b/xen/arch/x86/microcode.c index db1e424b2c..9c4b4d66f8 100644 --- a/xen/arch/x86/microcode.c +++ b/xen/arch/x86/microcode.c @@ -152,7 +152,7 @@ static void collect_cpu_info (void *unused) unsigned int val[2]; uci->sig = uci->pf = uci->rev = uci->cksum = 0; - uci->err = MC_NOTFOUND; + uci->err = MC_NOTFOUND; uci->mc = NULL; if (c->x86_vendor != X86_VENDOR_INTEL || c->x86 < 6 || @@ -460,7 +460,7 @@ int microcode_update(void *buf, unsigned long len) int ret; if (len < DEFAULT_UCODE_TOTALSIZE) { - printk(KERN_ERR "microcode: not enough data\n"); + printk(KERN_ERR "microcode: not enough data\n"); return -EINVAL; } diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index b5b778d83f..0c35c9b52d 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -1377,7 +1377,7 @@ static int mod_l3_entry(l3_pgentry_t *pl3e, #if CONFIG_PAGING_LEVELS >= 4 if ( unlikely(!l2_backptr(&vaddr, pgentry_ptr_to_slot(pl3e), type)) || unlikely(!get_page_from_l3e(nl3e, pfn, current->domain, vaddr)) ) - return 0; + return 0; #else vaddr = (((unsigned long)pl3e & ~PAGE_MASK) / sizeof(l3_pgentry_t)) << L3_PAGETABLE_SHIFT; @@ -2190,7 +2190,7 @@ int do_mmu_update( goto out; } - perfc_incrc(calls_to_mmu_update); + perfc_incrc(calls_to_mmu_update); perfc_addc(num_page_updates, count); perfc_incr_histo(bpt_updates, count, PT_UPDATES); diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index 3a53d91fd8..7141b55f27 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -107,7 +107,7 @@ static int __init mpf_checksum(unsigned char *mp, int len) * doing this .... */ -static int mpc_record; +static int mpc_record; static struct mpc_config_translation *translation_table[MAX_MPC_ENTRY] __initdata; #ifdef CONFIG_X86_NUMAQ diff --git a/xen/arch/x86/oprofile/nmi_int.c b/xen/arch/x86/oprofile/nmi_int.c index f9602d72d0..24a1fea86e 100644 --- a/xen/arch/x86/oprofile/nmi_int.c +++ b/xen/arch/x86/oprofile/nmi_int.c @@ -59,7 +59,7 @@ int nmi_callback(struct cpu_user_regs *regs, int cpu) static void nmi_cpu_save_registers(struct op_msrs *msrs) { unsigned int const nr_ctrs = model->num_counters; - unsigned int const nr_ctrls = model->num_controls; + unsigned int const nr_ctrls = model->num_controls; struct op_msr *counters = msrs->counters; struct op_msr *controls = msrs->controls; unsigned int i; @@ -180,7 +180,7 @@ void nmi_disable_virq(void) static void nmi_restore_registers(struct op_msrs * msrs) { unsigned int const nr_ctrs = model->num_counters; - unsigned int const nr_ctrls = model->num_controls; + unsigned int const nr_ctrls = model->num_controls; struct op_msr * counters = msrs->counters; struct op_msr * controls = msrs->controls; unsigned int i; diff --git a/xen/arch/x86/oprofile/op_model_p4.c b/xen/arch/x86/oprofile/op_model_p4.c index 453ee2ec8e..018124eaf9 100644 --- a/xen/arch/x86/oprofile/op_model_p4.c +++ b/xen/arch/x86/oprofile/op_model_p4.c @@ -401,7 +401,7 @@ static unsigned long reset_value[NUM_COUNTERS_NON_HT]; static void p4_fill_in_addresses(struct op_msrs * const msrs) { - unsigned int i; + unsigned int i; unsigned int addr, stag; setup_num_counters(); diff --git a/xen/arch/x86/oprofile/xenoprof.c b/xen/arch/x86/oprofile/xenoprof.c index a307429080..cc0dcc7816 100644 --- a/xen/arch/x86/oprofile/xenoprof.c +++ b/xen/arch/x86/oprofile/xenoprof.c @@ -255,7 +255,7 @@ int reset_active(struct domain *d) active_ready[ind] = 0; active_domains[ind] = NULL; activated--; - put_domain(d); + put_domain(d); if ( activated <= 0 ) adomains = 0; @@ -316,7 +316,7 @@ int add_active_list (domid_t domid) if ( adomains >= MAX_OPROF_DOMAINS ) return -E2BIG; - d = find_domain_by_id(domid); + d = find_domain_by_id(domid); if ( d == NULL ) return -EINVAL; @@ -339,7 +339,7 @@ int add_passive_list(XEN_GUEST_HANDLE(void) arg) if ( copy_from_guest(&passive, arg, 1) ) return -EFAULT; - d = find_domain_by_id(passive.domain_id); + d = find_domain_by_id(passive.domain_id); if ( d == NULL ) return -EINVAL; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index dbf4909495..ff0589082a 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -44,7 +44,7 @@ boolean_param("nosmp", opt_nosmp); /* maxcpus: maximum number of CPUs to activate. */ static unsigned int max_cpus = NR_CPUS; -integer_param("maxcpus", max_cpus); +integer_param("maxcpus", max_cpus); /* opt_watchdog: If true, run a watchdog NMI on each processor. */ static int opt_watchdog = 0; diff --git a/xen/arch/x86/shadow.c b/xen/arch/x86/shadow.c index 4ff3d2fe45..f29985fc05 100644 --- a/xen/arch/x86/shadow.c +++ b/xen/arch/x86/shadow.c @@ -1874,7 +1874,7 @@ static int resync_all(struct domain *d, u32 stype) { if ( entry_get_flags(shadow_pt[i]) & _PAGE_PRESENT ) put_shadow_ref(entry_get_pfn(shadow_pt[i])); - shadow_pt[i] = entry_empty(); + shadow_pt[i] = entry_empty(); continue; } @@ -1933,7 +1933,7 @@ static int resync_all(struct domain *d, u32 stype) { if ( l4e_get_flags(shadow4[i]) & _PAGE_PRESENT ) put_shadow_ref(l4e_get_pfn(shadow4[i])); - shadow4[i] = l4e_empty(); + shadow4[i] = l4e_empty(); continue; } @@ -2007,7 +2007,7 @@ static int resync_all_levels_guest_page(struct domain *d) { int need_flush = 0; - need_flush |= resync_all(d, PGT_l1_shadow); + need_flush |= resync_all(d, PGT_l1_shadow); if ( d->arch.ops->guest_paging_levels == PAGING_L2 && shadow_mode_translate(d) ) { @@ -3223,7 +3223,7 @@ static unsigned long shadow_l3_table( * Xen private mappings. Use the va_mask part. */ mfn_to_page(s2mfn)->u.inuse.type_info |= - (unsigned long) 3 << PGT_score_shift; + (unsigned long) 3 << PGT_score_shift; memset(spl2e, 0, (L2_PAGETABLE_FIRST_XEN_SLOT & (L2_PAGETABLE_ENTRIES-1)) * sizeof(l2_pgentry_t)); diff --git a/xen/arch/x86/shadow32.c b/xen/arch/x86/shadow32.c index a2c82138c3..392669746e 100644 --- a/xen/arch/x86/shadow32.c +++ b/xen/arch/x86/shadow32.c @@ -1159,7 +1159,7 @@ int __shadow_mode_enable(struct domain *d, unsigned int mode) int new_modes = (mode & ~d->arch.shadow_mode); if(!new_modes) /* Nothing to do - return success */ - return 0; + return 0; // can't take anything away by calling this function. ASSERT(!(d->arch.shadow_mode & ~mode)); @@ -1298,7 +1298,7 @@ int __shadow_mode_enable(struct domain *d, unsigned int mode) audit_adjust_pgtables(d, -1, 1); - for (list_ent = d->page_list.next; list_ent != &d->page_list; + for (list_ent = d->page_list.next; list_ent != &d->page_list; list_ent = page->list.next) { page = list_entry(list_ent, struct page_info, list); @@ -1525,7 +1525,7 @@ static int shadow_mode_table_op( } if ( sc->pages > d->arch.shadow_dirty_bitmap_size ) - sc->pages = d->arch.shadow_dirty_bitmap_size; + sc->pages = d->arch.shadow_dirty_bitmap_size; #define chunk (8*1024) /* Transfer and clear in 1kB chunks for L1 cache. */ for ( i = 0; i < sc->pages; i += chunk ) @@ -1561,7 +1561,7 @@ static int shadow_mode_table_op( } if ( sc->pages > d->arch.shadow_dirty_bitmap_size ) - sc->pages = d->arch.shadow_dirty_bitmap_size; + sc->pages = d->arch.shadow_dirty_bitmap_size; if ( copy_to_guest(sc->dirty_bitmap, d->arch.shadow_dirty_bitmap, @@ -2704,7 +2704,7 @@ static int resync_all(struct domain *d, u32 stype) __shadow_get_l2e(entry->v, entry->va, &l2e); if (l2e_get_flags(l2e) & _PAGE_PRESENT) { - put_shadow_ref(l2e_get_pfn(l2e)); + put_shadow_ref(l2e_get_pfn(l2e)); l2e = l2e_empty(); __shadow_set_l2e(entry->v, entry->va, l2e); @@ -3579,7 +3579,7 @@ int check_l2_table( ((SH_LINEAR_PT_VIRT_START >> L2_PAGETABLE_SHIFT) - DOMAIN_ENTRIES_PER_L2_PAGETABLE) * sizeof(l2_pgentry_t)) ) { - for ( i = DOMAIN_ENTRIES_PER_L2_PAGETABLE; + for ( i = DOMAIN_ENTRIES_PER_L2_PAGETABLE; i < (SH_LINEAR_PT_VIRT_START >> L2_PAGETABLE_SHIFT); i++ ) printk("+++ (%d) %lx %lx\n",i, diff --git a/xen/arch/x86/shadow_public.c b/xen/arch/x86/shadow_public.c index 9350aa6d72..e64f29d1ca 100644 --- a/xen/arch/x86/shadow_public.c +++ b/xen/arch/x86/shadow_public.c @@ -1228,7 +1228,7 @@ int __shadow_mode_enable(struct domain *d, unsigned int mode) if ( shadow_mode_refcounts(d) ) { - struct list_head *list_ent; + struct list_head *list_ent; struct page_info *page; /* @@ -1254,7 +1254,7 @@ int __shadow_mode_enable(struct domain *d, unsigned int mode) audit_adjust_pgtables(d, -1, 1); - for (list_ent = d->page_list.next; list_ent != &d->page_list; + for (list_ent = d->page_list.next; list_ent != &d->page_list; list_ent = page->list.next) { page = list_entry(list_ent, struct page_info, list); @@ -1343,7 +1343,7 @@ static int shadow_mode_table_op( } if ( sc->pages > d->arch.shadow_dirty_bitmap_size ) - sc->pages = d->arch.shadow_dirty_bitmap_size; + sc->pages = d->arch.shadow_dirty_bitmap_size; #define chunk (8*1024) /* Transfer and clear in 1kB chunks for L1 cache. */ for ( i = 0; i < sc->pages; i += chunk ) @@ -1378,7 +1378,7 @@ static int shadow_mode_table_op( } if ( sc->pages > d->arch.shadow_dirty_bitmap_size ) - sc->pages = d->arch.shadow_dirty_bitmap_size; + sc->pages = d->arch.shadow_dirty_bitmap_size; if ( copy_to_guest(sc->dirty_bitmap, d->arch.shadow_dirty_bitmap, diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 839b5e0c51..87f9a4fd42 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -785,7 +785,7 @@ static int __spurious_page_fault( #endif #if CONFIG_PAGING_LEVELS >= 3 - l3t = map_domain_page(mfn); + l3t = map_domain_page(mfn); #ifdef CONFIG_X86_PAE l3t += (cr3 & 0xFE0UL) >> 3; #endif diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 1379be6f1e..d5db7f3b30 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -154,7 +154,7 @@ void subarch_init_memory(void) (32 + BITS_TO_LONGS(NR_CPUS)*sizeof(long))); /* M2P table is mappable read-only by privileged domains. */ - for ( v = RDWR_MPT_VIRT_START; + for ( v = RDWR_MPT_VIRT_START; v != RDWR_MPT_VIRT_END; v += 1 << L2_PAGETABLE_SHIFT ) { diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index f0fa99349b..cfe2a6a5a0 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -242,7 +242,7 @@ void __init percpu_traps_init(void) /* Skip the NMI and DF stacks. */ stack = &stack[2048]; - wrmsr(MSR_LSTAR, (unsigned long)stack, ((unsigned long)stack>>32)); + wrmsr(MSR_LSTAR, (unsigned long)stack, ((unsigned long)stack>>32)); /* movq %rsp, saversp(%rip) */ stack[0] = 0x48; @@ -274,7 +274,7 @@ void __init percpu_traps_init(void) /* Skip the long-mode entry trampoline. */ stack = &stack[26]; - wrmsr(MSR_CSTAR, (unsigned long)stack, ((unsigned long)stack>>32)); + wrmsr(MSR_CSTAR, (unsigned long)stack, ((unsigned long)stack>>32)); /* movq %rsp, saversp(%rip) */ stack[0] = 0x48; diff --git a/xen/common/dom0_ops.c b/xen/common/dom0_ops.c index 01e4b14d8f..6c3a609e32 100644 --- a/xen/common/dom0_ops.c +++ b/xen/common/dom0_ops.c @@ -566,7 +566,7 @@ long do_dom0_op(XEN_GUEST_HANDLE(dom0_op_t) u_dom0_op) ret = read_console_ring( op->u.readconsole.buffer, &op->u.readconsole.count, - op->u.readconsole.clear); + op->u.readconsole.clear); if ( copy_to_guest(u_dom0_op, op, 1) ) ret = -EFAULT; } @@ -584,7 +584,7 @@ long do_dom0_op(XEN_GUEST_HANDLE(dom0_op_t) u_dom0_op) case DOM0_SETDOMAINMAXMEM: { - struct domain *d; + struct domain *d; unsigned long new_max; ret = -ESRCH; @@ -624,7 +624,7 @@ long do_dom0_op(XEN_GUEST_HANDLE(dom0_op_t) u_dom0_op) case DOM0_SETDEBUGGING: { - struct domain *d; + struct domain *d; ret = -ESRCH; d = find_domain_by_id(op->u.setdebugging.domain); if ( d != NULL ) diff --git a/xen/common/domain.c b/xen/common/domain.c index 284bbee0c4..2c9db4e3a3 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -459,7 +459,7 @@ int set_info_guest(struct domain *d, dom0_setvcpucontext_t *setvcpucontext) int rc = 0; struct vcpu_guest_context *c = NULL; unsigned long vcpu = setvcpucontext->vcpu; - struct vcpu *v; + struct vcpu *v; if ( (vcpu >= MAX_VIRT_CPUS) || ((v = d->vcpu[vcpu]) == NULL) ) return -EINVAL; diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 21e5862a08..fb7118e71f 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -25,8 +25,8 @@ static struct { irq_keyhandler_t *irq_handler; } u; unsigned int flags; - char desc[STR_MAX]; -} key_table[KEY_MAX]; + char desc[STR_MAX]; +} key_table[KEY_MAX]; #define KEYHANDLER_IRQ_CALLBACK 0x1 @@ -63,7 +63,7 @@ void register_keyhandler( key_table[key].u.handler = handler; key_table[key].flags = 0; strncpy(key_table[key].desc, desc, STR_MAX); - key_table[key].desc[STR_MAX-1] = '\0'; + key_table[key].desc[STR_MAX-1] = '\0'; } void register_irq_keyhandler( @@ -73,12 +73,12 @@ void register_irq_keyhandler( key_table[key].u.irq_handler = handler; key_table[key].flags = KEYHANDLER_IRQ_CALLBACK; strncpy(key_table[key].desc, desc, STR_MAX); - key_table[key].desc[STR_MAX-1] = '\0'; + key_table[key].desc[STR_MAX-1] = '\0'; } static void show_handlers(unsigned char key) { - int i; + int i; printk("'%c' pressed -> showing installed handlers\n", key); for ( i = 0; i < KEY_MAX; i++ ) if ( key_table[i].u.handler != NULL ) @@ -96,7 +96,7 @@ static void dump_registers(unsigned char key, struct cpu_user_regs *regs) { unsigned int cpu; - printk("'%c' pressed -> dumping registers\n", key); + printk("'%c' pressed -> dumping registers\n", key); /* Get local execution state out immediately, in case we get stuck. */ printk("\n*** Dumping CPU%d state: ***\n", smp_processor_id()); @@ -113,8 +113,8 @@ static void dump_registers(unsigned char key, struct cpu_user_regs *regs) static void halt_machine(unsigned char key, struct cpu_user_regs *regs) { - printk("'%c' pressed -> rebooting machine\n", key); - machine_restart(NULL); + printk("'%c' pressed -> rebooting machine\n", key); + machine_restart(NULL); } static void cpuset_print(char *set, int size, cpumask_t mask) @@ -133,7 +133,7 @@ static void dump_domains(unsigned char key) char cpuset[100]; printk("'%c' pressed -> dumping domain info (now=0x%X:%08X)\n", key, - (u32)(now>>32), (u32)now); + (u32)(now>>32), (u32)now); read_lock(&domlist_lock); @@ -273,7 +273,7 @@ void initialize_keytable(void) open_softirq(KEYPRESS_SOFTIRQ, keypress_softirq); register_irq_keyhandler( - 'd', dump_registers, "dump registers"); + 'd', dump_registers, "dump registers"); register_keyhandler( 'h', show_handlers, "show this message"); register_keyhandler( @@ -281,7 +281,7 @@ void initialize_keytable(void) register_keyhandler( 'r', dump_runq, "dump run queues"); register_irq_keyhandler( - 'R', halt_machine, "reboot machine"); + 'R', halt_machine, "reboot machine"); register_keyhandler( 't', read_clocks, "display multi-cpu clock info"); @@ -295,9 +295,9 @@ void initialize_keytable(void) #ifdef PERF_COUNTERS register_keyhandler( - 'p', perfc_printall, "print performance counters"); + 'p', perfc_printall, "print performance counters"); register_keyhandler( - 'P', perfc_reset, "reset performance counters"); + 'P', perfc_reset, "reset performance counters"); #endif register_irq_keyhandler('%', do_debug_key, "Trap to xendbg"); diff --git a/xen/common/sched_bvt.c b/xen/common/sched_bvt.c index 9ba597b54c..839194a1ad 100644 --- a/xen/common/sched_bvt.c +++ b/xen/common/sched_bvt.c @@ -382,7 +382,7 @@ static int bvt_adjdom( static struct task_slice bvt_do_schedule(s_time_t now) { struct domain *d; - struct vcpu *prev = current, *next = NULL, *next_prime, *ed; + struct vcpu *prev = current, *next = NULL, *next_prime, *ed; int cpu = prev->processor; s32 r_time; /* time for new dom to run */ u32 next_evt, next_prime_evt, min_avt; diff --git a/xen/common/sched_sedf.c b/xen/common/sched_sedf.c index 240bb503fe..c3a9d14221 100644 --- a/xen/common/sched_sedf.c +++ b/xen/common/sched_sedf.c @@ -69,7 +69,7 @@ struct sedf_vcpu_info { /*Advaced Parameters*/ /*Latency Scaling*/ - s_time_t period_orig; + s_time_t period_orig; s_time_t slice_orig; s_time_t latency; @@ -87,7 +87,7 @@ struct sedf_vcpu_info { s_time_t unblock_abs; /*scores for {util, block penalty}-weighted extratime distribution*/ - int score[2]; + int score[2]; s_time_t short_block_lost_tot; /*Statistics*/ @@ -157,7 +157,7 @@ static inline void extraq_del(struct vcpu *d, int i) struct list_head *list = EXTRALIST(d,i); ASSERT(extraq_on(d,i)); PRINT(3, "Removing domain %i.%i from L%i extraq\n", - d->domain->domain_id, d->vcpu_id, i); + d->domain->domain_id, d->vcpu_id, i); list_del(list); list->next = NULL; ASSERT(!extraq_on(d, i)); @@ -179,7 +179,7 @@ static inline void extraq_add_sort_update(struct vcpu *d, int i, int sub) PRINT(3, "Adding domain %i.%i (score= %i, short_pen= %"PRIi64")" " to L%i extraq\n", d->domain->domain_id, d->vcpu_id, EDOM_INFO(d)->score[i], - EDOM_INFO(d)->short_block_lost_tot, i); + EDOM_INFO(d)->short_block_lost_tot, i); /* * Iterate through all elements to find our "hole" and on our way diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 861d4373eb..6913e4992f 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -673,7 +673,7 @@ void dump_runq(unsigned char key) printk("Scheduler: %s (%s)\n", ops.name, ops.opt_name); SCHED_OP(dump_settings); - printk("NOW=0x%08X%08X\n", (u32)(now>>32), (u32)now); + printk("NOW=0x%08X%08X\n", (u32)(now>>32), (u32)now); for_each_online_cpu ( i ) { diff --git a/xen/common/timer.c b/xen/common/timer.c index 526bb48959..8f2fa9964e 100644 --- a/xen/common/timer.c +++ b/xen/common/timer.c @@ -343,12 +343,12 @@ static void dump_timerq(unsigned char key) { struct timer *t; struct timers *ts; - unsigned long flags; + unsigned long flags; s_time_t now = NOW(); int i, j; printk("Dumping timer queues: NOW=0x%08X%08X\n", - (u32)(now>>32), (u32)now); + (u32)(now>>32), (u32)now); for_each_online_cpu( i ) { diff --git a/xen/include/acm/acm_core.h b/xen/include/acm/acm_core.h index 1afb3697fd..1922a2b8ae 100644 --- a/xen/include/acm/acm_core.h +++ b/xen/include/acm/acm_core.h @@ -46,7 +46,7 @@ struct ste_binary_policy { u32 max_ssidrefs; domaintype_t *ssidrefs; /* [max_ssidrefs][max_types] */ atomic_t ec_eval_count, gt_eval_count; - atomic_t ec_denied_count, gt_denied_count; + atomic_t ec_denied_count, gt_denied_count; atomic_t ec_cachehit_count, gt_cachehit_count; }; diff --git a/xen/include/asm-x86/acpi.h b/xen/include/asm-x86/acpi.h index b13f8ff79a..51c4b8e293 100644 --- a/xen/include/asm-x86/acpi.h +++ b/xen/include/asm-x86/acpi.h @@ -116,7 +116,7 @@ extern int acpi_ht; extern int acpi_pci_disabled; static inline void disable_acpi(void) { - acpi_disabled = 1; + acpi_disabled = 1; acpi_ht = 0; acpi_pci_disabled = 1; acpi_noirq = 1; diff --git a/xen/include/asm-x86/genapic.h b/xen/include/asm-x86/genapic.h index 210ff6ee2d..d3cbef26b1 100644 --- a/xen/include/asm-x86/genapic.h +++ b/xen/include/asm-x86/genapic.h @@ -18,8 +18,8 @@ struct mp_config_table; struct mpc_config_processor; struct genapic { - char *name; - int (*probe)(void); + char *name; + int (*probe)(void); /* When one of the next two hooks returns 1 the genapic is switched to this. Essentially they are additional probe @@ -30,13 +30,13 @@ struct genapic { /* Interrupt delivery parameters ('physical' vs. 'logical flat'). */ int int_delivery_mode; - int int_dest_mode; + int int_dest_mode; void (*init_apic_ldr)(void); void (*clustered_apic_check)(void); cpumask_t (*target_cpus)(void); unsigned int (*cpu_mask_to_apicid)(cpumask_t cpumask); void (*send_IPI_mask)(cpumask_t mask, int vector); -}; +}; #define APICFUNC(x) .x = x diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index e3a608438d..73f3b31275 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -64,8 +64,8 @@ struct hvm_function_table { * 1) TS bit in guest cr0 * 2) TSC offset in guest */ - void (*stts)(struct vcpu *v); - void (*set_tsc_offset)(struct vcpu *v, u64 offset); + void (*stts)(struct vcpu *v); + void (*set_tsc_offset)(struct vcpu *v, u64 offset); void (*init_ap_context)(struct vcpu_guest_context *ctxt, int vcpuid, int trampoline_vector); @@ -150,9 +150,9 @@ hvm_get_guest_ctrl_reg(struct vcpu *v, unsigned int num) return 0; /* force to fail */ } -extern void hvm_stts(struct vcpu *v); -extern void hvm_set_guest_time(struct vcpu *v, u64 gtime); -extern void hvm_do_resume(struct vcpu *v); +extern void hvm_stts(struct vcpu *v); +extern void hvm_set_guest_time(struct vcpu *v, u64 gtime); +extern void hvm_do_resume(struct vcpu *v); static inline void hvm_init_ap_context(struct vcpu_guest_context *ctxt, diff --git a/xen/include/asm-x86/hvm/svm/vmcb.h b/xen/include/asm-x86/hvm/svm/vmcb.h index dbb8ca8c1e..7d227f77c5 100644 --- a/xen/include/asm-x86/hvm/svm/vmcb.h +++ b/xen/include/asm-x86/hvm/svm/vmcb.h @@ -308,7 +308,7 @@ typedef union u64 ev: 1; u64 resvd1: 19; u64 v: 1; - u64 errorcode:32; + u64 errorcode:32; } fields; } __attribute__ ((packed)) eventinj_t; diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 90163a8883..433bcd2e91 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -27,7 +27,7 @@ extern int start_vmx(void); extern void vmcs_dump_vcpu(void); extern void vmx_init_vmcs_config(void); -extern void setup_vmcs_dump(void); +extern void setup_vmcs_dump(void); enum { VMX_CPU_STATE_PAE_ENABLED=0, diff --git a/xen/include/asm-x86/mach-es7000/mach_mpparse.h b/xen/include/asm-x86/mach-es7000/mach_mpparse.h index ce17262a13..98ff371f0b 100644 --- a/xen/include/asm-x86/mach-es7000/mach_mpparse.h +++ b/xen/include/asm-x86/mach-es7000/mach_mpparse.h @@ -32,7 +32,7 @@ static inline int es7000_check_dsdt(void) /* Hook from generic ACPI tables.c */ static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id) { - unsigned long oem_addr; + unsigned long oem_addr; if (!find_unisys_acpi_oem_table(&oem_addr)) { if (es7000_check_dsdt()) return parse_unisys_oem((char *)oem_addr); diff --git a/xen/include/asm-x86/mach-generic/mach_mpparse.h b/xen/include/asm-x86/mach-generic/mach_mpparse.h index b2308e9149..f62c8dc146 100644 --- a/xen/include/asm-x86/mach-generic/mach_mpparse.h +++ b/xen/include/asm-x86/mach-generic/mach_mpparse.h @@ -12,7 +12,7 @@ static inline void mpc_oem_pci_bus(struct mpc_config_bus *m, { } -int mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid); -int acpi_madt_oem_check(char *oem_id, char *oem_table_id); +int mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid); +int acpi_madt_oem_check(char *oem_id, char *oem_table_id); #endif diff --git a/xen/include/asm-x86/msr.h b/xen/include/asm-x86/msr.h index 932cfcabb5..f1c08cf500 100644 --- a/xen/include/asm-x86/msr.h +++ b/xen/include/asm-x86/msr.h @@ -13,7 +13,7 @@ : "=a" (a__), "=d" (b__) \ : "c" (msr)); \ val = a__ | ((u64)b__<<32); \ -} while(0); +} while(0); #define wrmsr(msr,val1,val2) \ __asm__ __volatile__("wrmsr" \ diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index f7539d57ae..d460544d3e 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -280,26 +280,26 @@ static always_inline unsigned int cpuid_edx(unsigned int op) static inline unsigned long read_cr0(void) { - unsigned long __cr0; - __asm__("mov %%cr0,%0\n\t" :"=r" (__cr0)); - return __cr0; + unsigned long __cr0; + __asm__("mov %%cr0,%0\n\t" :"=r" (__cr0)); + return __cr0; } static inline void write_cr0(unsigned long val) { - __asm__("mov %0,%%cr0": :"r" ((unsigned long)val)); + __asm__("mov %0,%%cr0": :"r" ((unsigned long)val)); } static inline unsigned long read_cr4(void) { - unsigned long __cr4; - __asm__("mov %%cr4,%0\n\t" :"=r" (__cr4)); - return __cr4; + unsigned long __cr4; + __asm__("mov %%cr4,%0\n\t" :"=r" (__cr4)); + return __cr4; } static inline void write_cr4(unsigned long val) { - __asm__("mov %0,%%cr4": :"r" ((unsigned long)val)); + __asm__("mov %0,%%cr4": :"r" ((unsigned long)val)); } diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index f7d76af88e..7144b24d8b 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -1136,7 +1136,7 @@ static void shadow_audit(struct domain *d, int print) a = a->next; while ( a && (live < 9999) ) { - live++; + live++; if ( (a->gpfn_and_flags == 0) || (a->smfn == 0) ) { printk("XXX live=%d gpfn+flags=%lx sp=%lx next=%p\n", @@ -1144,13 +1144,13 @@ static void shadow_audit(struct domain *d, int print) BUG(); } ASSERT(a->smfn); - a = a->next; + a = a->next; } ASSERT(live < 9999); } for ( a = d->arch.shadow_ht_free; a != NULL; a = a->next ) - free++; + free++; if ( print ) printk("Xlive=%d free=%d\n", live, free); @@ -1731,7 +1731,7 @@ static inline unsigned long gva_to_gpa(unsigned long gva) if ( !(l1e_get_flags(gpte) & _PAGE_PRESENT) ) return 0; - return l1e_get_paddr(gpte) + (gva & ~PAGE_MASK); + return l1e_get_paddr(gpte) + (gva & ~PAGE_MASK); } #endif diff --git a/xen/include/asm-x86/shadow_64.h b/xen/include/asm-x86/shadow_64.h index c02379c341..d9afbdca18 100644 --- a/xen/include/asm-x86/shadow_64.h +++ b/xen/include/asm-x86/shadow_64.h @@ -139,7 +139,7 @@ static inline int table_offset_64(unsigned long va, int level) #endif #else case 4: - return PAE_SHADOW_SELF_ENTRY; + return PAE_SHADOW_SELF_ENTRY; #endif #endif default: diff --git a/xen/include/asm-x86/string.h b/xen/include/asm-x86/string.h index 3785004f9e..2bbdf0ce42 100644 --- a/xen/include/asm-x86/string.h +++ b/xen/include/asm-x86/string.h @@ -140,7 +140,7 @@ static inline void *__constant_c_memset(void *s, unsigned long c, size_t count) : "a" (c), "r" (count%BYTES_PER_LONG), "0" (count/BYTES_PER_LONG), "1" (s) : "memory" ); - return s; + return s; } /* diff --git a/xen/include/asm-x86/uaccess.h b/xen/include/asm-x86/uaccess.h index e9004e490f..e3bc3b48bf 100644 --- a/xen/include/asm-x86/uaccess.h +++ b/xen/include/asm-x86/uaccess.h @@ -14,8 +14,8 @@ #include <asm/x86_32/uaccess.h> #endif -unsigned long copy_to_user(void *to, const void *from, unsigned len); -unsigned long copy_from_user(void *to, const void *from, unsigned len); +unsigned long copy_to_user(void *to, const void *from, unsigned len); +unsigned long copy_from_user(void *to, const void *from, unsigned len); /* Handles exceptions in both to and from, but doesn't do access_ok */ unsigned long __copy_to_user_ll(void *to, const void *from, unsigned n); unsigned long __copy_from_user_ll(void *to, const void *from, unsigned n); @@ -251,7 +251,7 @@ __copy_from_user(void *to, const void __user *from, unsigned long n) return ret; case 8: __get_user_size(*(u64*)to, from, 8, ret, 8); - return ret; + return ret; } } return __copy_from_user_ll(to, from, n); diff --git a/xen/include/xen/gdbstub.h b/xen/include/xen/gdbstub.h index c4423fa6ed..f851f6193d 100644 --- a/xen/include/xen/gdbstub.h +++ b/xen/include/xen/gdbstub.h @@ -27,10 +27,10 @@ #ifdef CRASH_DEBUG /* value <-> char (de)serialzers for arch specific gdb backends */ -char hex2char(unsigned long x); -int char2hex(unsigned char c); -char str2hex(const char *str); -unsigned long str2ulong(const char *str, unsigned long bytes); +char hex2char(unsigned long x); +int char2hex(unsigned char c); +char str2hex(const char *str); +unsigned long str2ulong(const char *str, unsigned long bytes); struct gdb_context { int serhnd; @@ -52,7 +52,7 @@ void gdb_write_to_packet( const char *buf, int count, struct gdb_context *ctx); void gdb_write_to_packet_hex( unsigned long x, int int_size, struct gdb_context *ctx); -void gdb_send_packet(struct gdb_context *ctx); +void gdb_send_packet(struct gdb_context *ctx); void gdb_send_reply(const char *buf, struct gdb_context *ctx); /* gdb stub trap handler: entry point */ diff --git a/xen/include/xen/keyhandler.h b/xen/include/xen/keyhandler.h index 112ab3475b..ba443ae48f 100644 --- a/xen/include/xen/keyhandler.h +++ b/xen/include/xen/keyhandler.h @@ -1,7 +1,7 @@ /****************************************************************************** * keyhandler.h * - * We keep an array of 'handlers' for each key code between 0 and 255; + * We keep an array of 'handlers' for each key code between 0 and 255; * this is intended to allow very simple debugging routines (toggle * debug flag, dump registers, reboot, etc) to be hooked in in a slightly * nicer fashion than just editing the serial/keyboard drivers. @@ -16,7 +16,7 @@ */ typedef void keyhandler_t(unsigned char key); extern void register_keyhandler( - unsigned char key, keyhandler_t *handler, char *desc); + unsigned char key, keyhandler_t *handler, char *desc); /* * Register an IRQ callback function for key @key. The callback occurs @@ -25,7 +25,7 @@ extern void register_keyhandler( */ typedef void irq_keyhandler_t(unsigned char key, struct cpu_user_regs *regs); extern void register_irq_keyhandler( - unsigned char key, irq_keyhandler_t *handler, char *desc); + unsigned char key, irq_keyhandler_t *handler, char *desc); /* Inject a keypress into the key-handling subsystem. */ extern void handle_keypress(unsigned char key, struct cpu_user_regs *regs); diff --git a/xen/include/xen/list.h b/xen/include/xen/list.h index 93d9f987e7..66cdfc814b 100644 --- a/xen/include/xen/list.h +++ b/xen/include/xen/list.h @@ -101,7 +101,7 @@ static __inline__ void list_del(struct list_head *entry) static __inline__ void list_del_init(struct list_head *entry) { __list_del(entry->prev, entry->next); - INIT_LIST_HEAD(entry); + INIT_LIST_HEAD(entry); } /** |