summaryrefslogtreecommitdiff
path: root/kern
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 /kern
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 'kern')
-rw-r--r--kern/boot_script.c3
-rw-r--r--kern/bootstrap.c5
-rw-r--r--kern/host.c2
-rw-r--r--kern/ipc_tt.c2
-rw-r--r--kern/mach_clock.c6
-rw-r--r--kern/processor.c2
-rw-r--r--kern/strings.c2
-rw-r--r--kern/task.c2
-rw-r--r--kern/thread.c4
9 files changed, 15 insertions, 13 deletions
diff --git a/kern/boot_script.c b/kern/boot_script.c
index b245d1d8..b2ae901c 100644
--- a/kern/boot_script.c
+++ b/kern/boot_script.c
@@ -294,7 +294,8 @@ boot_script_parse_line (void *hook, char *cmdline)
for (p += 2;;)
{
char c;
- int i, type;
+ unsigned i;
+ int type;
long val;
struct sym *s;
diff --git a/kern/bootstrap.c b/kern/bootstrap.c
index 08362767..7398ea44 100644
--- a/kern/bootstrap.c
+++ b/kern/bootstrap.c
@@ -124,7 +124,7 @@ free_bootstrap_pages(phys_addr_t start, phys_addr_t end)
void bootstrap_create(void)
{
int compat;
- int n = 0;
+ unsigned n = 0;
#ifdef MACH_XEN
struct multiboot_module *bmods = ((struct multiboot_module *)
boot_info.mod_start);
@@ -164,7 +164,8 @@ void bootstrap_create(void)
}
else
{
- int i, losers;
+ unsigned i;
+ int losers;
/* Initialize boot script variables. We leak these send rights. */
losers = boot_script_set_variable
diff --git a/kern/host.c b/kern/host.c
index 2855cd2d..57280c49 100644
--- a/kern/host.c
+++ b/kern/host.c
@@ -51,7 +51,7 @@ kern_return_t host_processors(
processor_array_t *processor_list,
natural_t *countp)
{
- int i;
+ unsigned i;
processor_t *tp;
vm_offset_t addr;
unsigned int count;
diff --git a/kern/ipc_tt.c b/kern/ipc_tt.c
index e4d657b7..04a5a92f 100644
--- a/kern/ipc_tt.c
+++ b/kern/ipc_tt.c
@@ -818,7 +818,7 @@ mach_ports_register(
mach_msg_type_number_t portsCnt)
{
ipc_port_t ports[TASK_PORT_REGISTER_MAX];
- int i;
+ unsigned i;
if ((task == TASK_NULL) ||
(portsCnt > TASK_PORT_REGISTER_MAX))
diff --git a/kern/mach_clock.c b/kern/mach_clock.c
index d6ebf23e..e4d44f57 100644
--- a/kern/mach_clock.c
+++ b/kern/mach_clock.c
@@ -74,11 +74,11 @@ int timedelta = 0;
int tickdelta = 0;
#if HZ > 500
-int tickadj = 1; /* can adjust HZ usecs per second */
+unsigned tickadj = 1; /* can adjust HZ usecs per second */
#else
-int tickadj = 500 / HZ; /* can adjust 100 usecs per second */
+unsigned tickadj = 500 / HZ; /* can adjust 100 usecs per second */
#endif
-int bigadj = 1000000; /* adjust 10*tickadj if adjustment
+unsigned bigadj = 1000000; /* adjust 10*tickadj if adjustment
> bigadj */
/*
diff --git a/kern/processor.c b/kern/processor.c
index 0a88469b..dffd7d0b 100644
--- a/kern/processor.c
+++ b/kern/processor.c
@@ -849,7 +849,7 @@ processor_set_things(
int type)
{
unsigned int actual; /* this many things */
- int i;
+ unsigned i;
vm_size_t size, size_needed;
vm_offset_t addr;
diff --git a/kern/strings.c b/kern/strings.c
index e299534a..64410d91 100644
--- a/kern/strings.c
+++ b/kern/strings.c
@@ -184,7 +184,7 @@ memset(
void *_s, int c, size_t n)
{
char *s = _s;
- int i;
+ size_t i;
for (i = 0; i < n ; i++)
s[i] = c;
diff --git a/kern/task.c b/kern/task.c
index 0f24e44d..d721f172 100644
--- a/kern/task.c
+++ b/kern/task.c
@@ -565,7 +565,7 @@ kern_return_t task_threads(
unsigned int actual; /* this many threads */
thread_t thread;
thread_t *threads;
- int i;
+ unsigned i;
vm_size_t size, size_needed;
vm_offset_t addr;
diff --git a/kern/thread.c b/kern/thread.c
index ce44ed14..a8211491 100644
--- a/kern/thread.c
+++ b/kern/thread.c
@@ -2332,7 +2332,7 @@ void consider_thread_collect(void)
vm_size_t stack_usage(
vm_offset_t stack)
{
- int i;
+ unsigned i;
for (i = 0; i < KERNEL_STACK_SIZE/sizeof(unsigned int); i++)
if (((unsigned int *)stack)[i] != STACK_MARKER)
@@ -2350,7 +2350,7 @@ void stack_init(
vm_offset_t stack)
{
if (stack_check_usage) {
- int i;
+ unsigned i;
for (i = 0; i < KERNEL_STACK_SIZE/sizeof(unsigned int); i++)
((unsigned int *)stack)[i] = STACK_MARKER;