diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-03-29 13:17:46 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-03-29 13:21:25 +0200 |
| commit | 86156357706b3c741c6b5feda1d36d8687c660de (patch) | |
| tree | 35fa025a58f2489827d1afb275a632465fbb7daf /xen/grant.c | |
| parent | 1e90662dd80c64de27b432c9d6911fad937da804 (diff) | |
| download | gnumach-86156357706b3c741c6b5feda1d36d8687c660de.tar.gz gnumach-86156357706b3c741c6b5feda1d36d8687c660de.tar.bz2 gnumach-86156357706b3c741c6b5feda1d36d8687c660de.zip | |
64bit: fix warnings
* device/net_io.h (net_set_filter, ethernet_priority): Add prototypes.
* device/subrs.h: Include <device/if_hdr.h>.
(if_init_queues): Add prototype.
* i386/i386/model_dep.h (machine_relax): Add prototype.
* i386/i386/trap.c (i386_astintr): Move mycpu variable definition to
where it is used.
* i386/i386at/model_dep.c (i386at_init): Likewise for nb_direct, addr,
delta.
* i386/xen/xen.c (return_to_iret): Change type to char[].
* xen/console.c: Include <i386at/kd.h>.
* xen/evt.c (hyp_evt_handler): Cast NEVNT to int.
* xen/grant.c: Include <model_dep.h>.
(hyp_grant_takeback, hyp_grant_init): Fix print format.
* xen/net.c: Include <device/subrs.h>.
(paranoia): Remove variable.
(hyp_net_init, device_close, device_open): Cast nd - vif_data to int.
Fix print format.
* xen/store.c (store_put): Cast sizeof to int.
* xen/time.c: Include "xen.h".
* xen/xen.h (hypclock_machine_intr): Add prototype.
Diffstat (limited to 'xen/grant.c')
| -rw-r--r-- | xen/grant.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xen/grant.c b/xen/grant.c index ae3a7bfc..6715a374 100644 --- a/xen/grant.c +++ b/xen/grant.c @@ -16,6 +16,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <model_dep.h> #include <sys/types.h> #include <mach/vm_param.h> #include <machine/spl.h> @@ -99,7 +100,7 @@ void hyp_grant_takeback(grant_ref_t grant) { simple_lock(&lock); if (grants[grant].flags & (GTF_reading|GTF_writing)) - panic("grant %d still in use (%lx)\n", grant, grants[grant].flags); + panic("grant %d still in use (%x)\n", grant, grants[grant].flags); /* Note: this is not safe, a cmpxchg is needed, see grant_table.h */ grants[grant].flags = 0; @@ -128,7 +129,7 @@ void hyp_grant_init(void) { ret = hyp_grant_table_op(GNTTABOP_setup_table, kvtolin(&setup), 1); if (ret) - panic("setup grant table error %d", ret); + panic("setup grant table error %ld", ret); if (setup.status) panic("setup grant table: %d\n", setup.status); |