WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] [PATCH] xen: x86_32p: fix build breakage from 22456:1b6cc8c6

To: xen-devel@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-devel] [PATCH] xen: x86_32p: fix build breakage from 22456:1b6cc8c6d1c7
From: Ian Campbell <ian.campbell@xxxxxxxxxx>
Date: Thu, 02 Dec 2010 15:11:08 +0000
Cc: keir@xxxxxxx
Delivery-date: Thu, 02 Dec 2010 07:12:23 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1291302603 0
# Node ID 5e9f6417bc3574a273d84b857e6244a7d57f7544
# Parent  f2ade357042fbac43f90ea70b18b55ea8e5bbd14
xen: x86_32p: fix build breakage from 22456:1b6cc8c6d1c7

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

diff -r f2ade357042f -r 5e9f6417bc35 xen/arch/x86/x86_32/pci.c
--- a/xen/arch/x86/x86_32/pci.c Thu Dec 02 12:49:01 2010 +0000
+++ b/xen/arch/x86/x86_32/pci.c Thu Dec 02 15:10:03 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 f2ade357042f -r 5e9f6417bc35 xen/arch/x86/x86_32/traps.c
--- a/xen/arch/x86/x86_32/traps.c       Thu Dec 02 12:49:01 2010 +0000
+++ b/xen/arch/x86/x86_32/traps.c       Thu Dec 02 15:10:03 2010 +0000
@@ -19,6 +19,8 @@
 #include <asm/hvm/support.h>
 
 #include <public/callback.h>
+
+extern asmlinkage int hypercall(void);
 
 static void print_xen_info(void)
 {
@@ -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-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-devel] [PATCH] xen: x86_32p: fix build breakage from 22456:1b6cc8c6d1c7, Ian Campbell <=