summaryrefslogtreecommitdiff
path: root/i386
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2016-05-18 02:25:28 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2016-05-18 02:33:30 +0200
commita7f248bf76dc0cabd1581143e9f4aa6454c91655 (patch)
tree3a11eb34d258dec0aef94b982ce870f85ca8b2ac /i386
parent6af1500b30bfdb343bbf1efe432f797cb2c03cdf (diff)
Fix gcc-6 warnings
* ddb/db_elf.c (elf_db_sym_init): Turn `i' into unsigned. * device/ds_routines.c (ds_device_open, device_writev_trap): Likewise. * i386/i386/user_ldt.c (i386_set_ldt): Likewise for `i', `min_selector', and `first_desc'. (i386_get_ldt): Likewise for `ldt_count'. (user_ldt_free): Likewise for `i'. * i386/i386/xen.h (hyp_set_ldt): Turn `count' into unsigned long. * i386/intel/pmap.c (pmap_bootstrap): Turn `i', `j' and 'n' into unsigned. (pmap_clear_bootstrap_pagetable): Likewise for `i' and `j'. * ipc/ipc_kmsg.c (ipc_msg_print): Turn `i' and `numwords' into unsigned. * kern/boot_script.c (boot_script_parse_line): Likewise for `i'. * kern/bootstrap.c (bootstrap_create): Likewise for `n' and `i'. * kern/host.c (host_processors): Likewise for `i'. * kern/ipc_tt.c (mach_ports_register): Likewise. * kern/mach_clock.c (tickadj, bigadj): turn into unsigned. * kern/processor.c (processor_set_things): Turn `i' into unsigned. * kern/task.c (task_threads): Likewise. * kern/thread.c (consider_thread_collect, stack_init): Likewise. * kern/strings.c (memset): Turn `i' into size_t. * vm/memory_object.c (memory_object_lock_request): Turn `i' into unsigned. * xen/block.c (hyp_block_init): Use %u format for evt. (device_open): Drop unused err variable. (device_write): Turn `copy_npages', `i', `nbpages', and `j' into unsigned. * xen/console.c (hypcnread, hypcnwrite, hypcnclose): Turn dev to dev_t. (hypcnclose): Return void. * xen/console.h (hypcnread, hypcnwrite, hypcnclose): Fix prototypes accordingly. * xen/evt.c (form_int_mask): Turn `i' into int. * xen/net.c (hyp_net_init): Use %u format for evt. (device_open): Remove unused `err' variable.
Diffstat (limited to 'i386')
-rw-r--r--i386/i386/user_ldt.c11
-rw-r--r--i386/i386/xen.h2
-rw-r--r--i386/intel/pmap.c8
3 files changed, 10 insertions, 11 deletions
diff --git a/i386/i386/user_ldt.c b/i386/i386/user_ldt.c
index d8bdb90f..e7705b52 100644
--- a/i386/i386/user_ldt.c
+++ b/i386/i386/user_ldt.c
@@ -57,11 +57,11 @@ i386_set_ldt(
{
user_ldt_t new_ldt, old_ldt, temp;
struct real_descriptor *dp;
- int i;
- int min_selector = 0;
+ unsigned i;
+ unsigned min_selector = 0;
pcb_t pcb;
vm_size_t ldt_size_needed;
- int first_desc = sel_idx(first_selector);
+ unsigned first_desc = sel_idx(first_selector);
vm_map_copy_t old_copy_object = NULL; /* Suppress gcc warning */
if (thread == THREAD_NULL)
@@ -224,7 +224,6 @@ i386_set_ldt(
if (new_ldt)
#ifdef MACH_PV_DESCRIPTORS
{
- int i;
#ifdef MACH_PV_PAGETABLES
for (i=0; i<(new_ldt->desc.limit_low + 1)/sizeof(struct real_descriptor); i+=PAGE_SIZE/sizeof(struct real_descriptor))
pmap_set_page_readwrite(&new_ldt->ldt[i]);
@@ -264,7 +263,7 @@ i386_get_ldt(thread, first_selector, selector_count, desc_list, count)
struct user_ldt *user_ldt;
pcb_t pcb;
int first_desc = sel_idx(first_selector);
- unsigned int ldt_count;
+ unsigned ldt_count;
vm_size_t ldt_size;
vm_size_t size, size_needed;
vm_offset_t addr;
@@ -370,7 +369,7 @@ void
user_ldt_free(user_ldt_t user_ldt)
{
#ifdef MACH_PV_DESCRIPTORS
- int i;
+ unsigned i;
#ifdef MACH_PV_PAGETABLES
for (i=0; i<(user_ldt->desc.limit_low + 1)/sizeof(struct real_descriptor); i+=PAGE_SIZE/sizeof(struct real_descriptor))
pmap_set_page_readwrite(&user_ldt->ldt[i]);
diff --git a/i386/i386/xen.h b/i386/i386/xen.h
index 49b0d52f..b434ddaf 100644
--- a/i386/i386/xen.h
+++ b/i386/i386/xen.h
@@ -260,7 +260,7 @@ MACH_INLINE void hyp_set_ldt(void *ldt, unsigned long nbentries) {
.arg1.linear_addr = kvtolin(ldt),
.arg2.nr_ents = nbentries,
};
- int count;
+ unsigned long count;
if (((unsigned long)ldt) & PAGE_MASK)
panic("ldt %p is not aligned on a page\n", ldt);
for (count=0; count<nbentries; count+= PAGE_SIZE/8)
diff --git a/i386/intel/pmap.c b/i386/intel/pmap.c
index 0771a08d..e362b454 100644
--- a/i386/intel/pmap.c
+++ b/i386/intel/pmap.c
@@ -643,7 +643,7 @@ void pmap_bootstrap(void)
kernel_pmap->dirbase = kernel_page_dir = (pt_entry_t*)phystokv(pmap_grab_page());
#endif /* PAE */
{
- int i;
+ unsigned i;
for (i = 0; i < NPDES; i++)
kernel_pmap->dirbase[i] = 0;
}
@@ -678,7 +678,7 @@ void pmap_bootstrap(void)
l2_map += (la >> PDESHIFT) & PDEMASK;
if (!(*l2_map & INTEL_PTE_VALID)) {
struct mmu_update update;
- int j, n;
+ unsigned j, n;
l1_map[n_l1map] = (pt_entry_t*) phystokv(pmap_grab_page());
for (j = 0; j < NPTES; j++)
@@ -857,11 +857,11 @@ void pmap_set_page_readonly_init(void *_vaddr) {
}
void pmap_clear_bootstrap_pagetable(pt_entry_t *base) {
- int i;
+ unsigned i;
pt_entry_t *dir;
vm_offset_t va = 0;
#if PAE
- int j;
+ unsigned j;
#endif /* PAE */
if (!hyp_mmuext_op_mfn (MMUEXT_UNPIN_TABLE, kv_to_mfn(base)))
panic("pmap_clear_bootstrap_pagetable: couldn't unpin page %p(%p)\n", base, (vm_offset_t) kv_to_ma(base));