# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1291358140 0
# Node ID da8b50f53ed59842bb1b5bde04e52e889f615aef
# Parent 1b6cc8c6d1c7889c31e75b34954b1af29fac871e
xen: x86_32p: fix build breakage from 22456:1b6cc8c6d1c7
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
xen/arch/x86/x86_32/pci.c | 3 ---
xen/arch/x86/x86_32/traps.c | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
diff -r 1b6cc8c6d1c7 -r da8b50f53ed5 xen/arch/x86/x86_32/pci.c
--- a/xen/arch/x86/x86_32/pci.c Thu Dec 02 09:37:04 2010 +0000
+++ b/xen/arch/x86/x86_32/pci.c Fri Dec 03 06:35:40 2010 +0000
@@ -10,9 +10,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 -r 1b6cc8c6d1c7 -r da8b50f53ed5 xen/arch/x86/x86_32/traps.c
--- a/xen/arch/x86/x86_32/traps.c Thu Dec 02 09:37:04 2010 +0000
+++ b/xen/arch/x86/x86_32/traps.c Fri Dec 03 06:35:40 2010 +0000
@@ -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 @@ void __devinit subarch_percpu_traps_init
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 even
static void hypercall_page_initialise_ring0_kernel(void *hypercall_page)
{
- extern asmlinkage int hypercall(void);
char *p;
int i;
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home