aboutsummaryrefslogtreecommitdiffstats
path: root/extras/mini-os/include/x86
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2009-07-15 09:09:48 +0100
committerKeir Fraser <keir.fraser@citrix.com>2009-07-15 09:09:48 +0100
commit0df54d980737b7c4bb07aa4ac29e1e7689a6019b (patch)
tree69c7a044efe1f909f03ad9ff32ef5a8e0d8a390f /extras/mini-os/include/x86
parent4a493bdc5c1f3ba22004fd6a260fc7b4c6d23fce (diff)
downloadxen-0df54d980737b7c4bb07aa4ac29e1e7689a6019b.tar.gz
xen-0df54d980737b7c4bb07aa4ac29e1e7689a6019b.tar.bz2
xen-0df54d980737b7c4bb07aa4ac29e1e7689a6019b.zip
minios: switch to C99 integer types
This is a necessary step to make minios build on NetBSD. Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Diffstat (limited to 'extras/mini-os/include/x86')
-rw-r--r--extras/mini-os/include/x86/os.h2
-rw-r--r--extras/mini-os/include/x86/x86_32/hypercall-x86_32.h4
-rw-r--r--extras/mini-os/include/x86/x86_64/hypercall-x86_64.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/extras/mini-os/include/x86/os.h b/extras/mini-os/include/x86/os.h
index 7fc3a83b53..6bd0ebee99 100644
--- a/extras/mini-os/include/x86/os.h
+++ b/extras/mini-os/include/x86/os.h
@@ -445,7 +445,7 @@ static __inline__ unsigned long __ffs(unsigned long word)
: /* no outputs */ \
: "c" (msr), "a" (val1), "d" (val2))
-#define wrmsrl(msr,val) wrmsr(msr,(u32)((u64)(val)),((u64)(val))>>32)
+#define wrmsrl(msr,val) wrmsr(msr,(uint32_t)((uint64_t)(val)),((uint64_t)(val))>>32)
#else /* ifdef __x86_64__ */
diff --git a/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h b/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h
index d5f5b1e713..43028eea0a 100644
--- a/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h
+++ b/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h
@@ -174,7 +174,7 @@ HYPERVISOR_sched_op(
static inline long
HYPERVISOR_set_timer_op(
- u64 timeout)
+ uint64_t timeout)
{
unsigned long timeout_hi = (unsigned long)(timeout>>32);
unsigned long timeout_lo = (unsigned long)timeout;
@@ -197,7 +197,7 @@ HYPERVISOR_get_debugreg(
static inline int
HYPERVISOR_update_descriptor(
- u64 ma, u64 desc)
+ uint64_t ma, uint64_t desc)
{
return _hypercall4(int, update_descriptor, ma, ma>>32, desc, desc>>32);
}
diff --git a/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h b/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h
index 32ea5bd611..b874f039fe 100644
--- a/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h
+++ b/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h
@@ -178,7 +178,7 @@ HYPERVISOR_sched_op(
static inline long
HYPERVISOR_set_timer_op(
- u64 timeout)
+ uint64_t timeout)
{
return _hypercall1(long, set_timer_op, timeout);
}