diff options
| author | Keir Fraser <keir@xen.org> | 2010-12-03 06:35:40 +0000 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2010-12-03 06:35:40 +0000 |
| commit | b779d4c30d066ba0059bb74ca6f45d8cd3aba5df (patch) | |
| tree | c41888196923943b925f1077fe9578acf03ce290 | |
| parent | 788b4a623e9127dd833643ece81b0d6fd8a4456c (diff) | |
| download | xen-b779d4c30d066ba0059bb74ca6f45d8cd3aba5df.tar.gz xen-b779d4c30d066ba0059bb74ca6f45d8cd3aba5df.tar.bz2 xen-b779d4c30d066ba0059bb74ca6f45d8cd3aba5df.zip | |
xen: x86_32p: fix build breakage from 22456:1b6cc8c6d1c7
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
| -rw-r--r-- | xen/arch/x86/x86_32/pci.c | 3 | ||||
| -rw-r--r-- | xen/arch/x86/x86_32/traps.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/xen/arch/x86/x86_32/pci.c b/xen/arch/x86/x86_32/pci.c index a5b8646e36..1f77ebc835 100644 --- a/xen/arch/x86/x86_32/pci.c +++ b/xen/arch/x86/x86_32/pci.c @@ -11,9 +11,6 @@ #define PCI_CONF_ADDRESS(bus, dev, func, reg) \ (0x80000000 | (bus << 16) | (dev << 11) | (func << 8) | (reg & ~3)) -uint32_t pci_conf_read(uint32_t cf8, uint8_t offset, uint8_t bytes); -void pci_conf_write(uint32_t cf8, uint8_t offset, uint8_t bytes, uint32_t data); - uint8_t pci_conf_read8( unsigned int bus, unsigned int dev, unsigned int func, unsigned int reg) { diff --git a/xen/arch/x86/x86_32/traps.c b/xen/arch/x86/x86_32/traps.c index a233c8307e..64baa3839e 100644 --- a/xen/arch/x86/x86_32/traps.c +++ b/xen/arch/x86/x86_32/traps.c @@ -20,6 +20,8 @@ #include <public/callback.h> +extern asmlinkage int hypercall(void); + static void print_xen_info(void) { char taint_str[TAINT_STRING_MAX_LEN]; @@ -333,7 +335,6 @@ static void set_task_gate(unsigned int n, unsigned int sel) void __devinit subarch_percpu_traps_init(void) { struct tss_struct *tss; - asmlinkage int hypercall(void); int cpu = smp_processor_id(); if ( cpu == 0 ) @@ -549,7 +550,6 @@ long do_set_callbacks(unsigned long event_selector, static void hypercall_page_initialise_ring0_kernel(void *hypercall_page) { - extern asmlinkage int hypercall(void); char *p; int i; |