diff options
| author | Robert Mustacchi <rm@joyent.com> | 2012-03-08 00:41:46 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2012-03-08 00:41:46 +0000 |
| commit | 9621d5228ac4dbdd99cdfe8f2946e7315261a893 (patch) | |
| tree | 488c0b64195ad83c993bb2bf67a12763937811ee /kvm_x86impl.h | |
| parent | 76be9d4d13f5c5d32d915820bbf956b73fd89aab (diff) | |
| download | illumos-kvm-9621d5228ac4dbdd99cdfe8f2946e7315261a893.tar.gz | |
HVM-719 kvm should build with gcc 4.4.420120517
Diffstat (limited to 'kvm_x86impl.h')
| -rw-r--r-- | kvm_x86impl.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/kvm_x86impl.h b/kvm_x86impl.h index faede86..6fdcfd3 100644 --- a/kvm_x86impl.h +++ b/kvm_x86impl.h @@ -17,7 +17,7 @@ * GPL HEADER END * * Copyright 2011 various Linux Kernel contributors. - * Copyright 2011 Joyent, Inc. All Rights Reserved. + * Copyright (c) 2012 Joyent, Inc. All Rights Reserved. */ #ifndef __KVM_X86_IMPL_H @@ -30,18 +30,18 @@ #include "kvm_x86.h" #include "kvm_cache_regs.h" -extern inline void kvm_clear_exception_queue(struct kvm_vcpu *); -extern inline void kvm_queue_interrupt(struct kvm_vcpu *, uint8_t, int); -extern inline void kvm_clear_interrupt_queue(struct kvm_vcpu *); -extern inline int kvm_event_needs_reinjection(struct kvm_vcpu *); -extern inline int kvm_exception_is_soft(unsigned int nr); +extern void kvm_clear_exception_queue(struct kvm_vcpu *); +extern void kvm_queue_interrupt(struct kvm_vcpu *, uint8_t, int); +extern void kvm_clear_interrupt_queue(struct kvm_vcpu *); +extern int kvm_event_needs_reinjection(struct kvm_vcpu *); +extern int kvm_exception_is_soft(unsigned int nr); extern kvm_cpuid_entry2_t *kvm_find_cpuid_entry(struct kvm_vcpu *, uint32_t, uint32_t); -extern inline int is_protmode(struct kvm_vcpu *); -extern inline int is_long_mode(struct kvm_vcpu *); -extern inline int is_pae(struct kvm_vcpu *); -extern inline int is_pse(struct kvm_vcpu *); -extern inline int is_paging(struct kvm_vcpu *); +extern int is_protmode(struct kvm_vcpu *); +extern int is_long_mode(struct kvm_vcpu *); +extern int is_pae(struct kvm_vcpu *); +extern int is_pse(struct kvm_vcpu *); +extern int is_paging(struct kvm_vcpu *); extern caddr_t page_address(page_t *); extern page_t *alloc_page(int, void **); @@ -55,18 +55,18 @@ typedef void (*kvm_xcall_t)(void *); extern void kvm_xcall(processorid_t, kvm_xcall_t, void *); extern int kvm_xcall_func(kvm_xcall_t, void *); -unsigned long native_read_cr0(void); +extern unsigned long native_read_cr0(void); #define read_cr0() (native_read_cr0()) -unsigned long native_read_cr4(void); +extern unsigned long native_read_cr4(void); #define read_cr4() (native_read_cr4()) -unsigned long native_read_cr3(void); +extern unsigned long native_read_cr3(void); #define read_cr3() (native_read_cr3()) -inline page_t *compound_head(page_t *); -inline void get_page(page_t *); -inline unsigned long get_desc_limit(const struct desc_struct *); +extern page_t *compound_head(page_t *); +extern void get_page(page_t *); +extern unsigned long get_desc_limit(const struct desc_struct *); extern unsigned long get_desc_base(const struct desc_struct *); -uint32_t bit(int); +extern uint32_t bit(int); #endif |