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-changelog

[Xen-changelog] merge?

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID d13f5c7daddfe41bcb8565d707eb76270a8a6671
# Parent  5f4724c130406fe7030a8cbe482441785010a6b1
# Parent  43d91cbb1bfb7cde37f46a00f383c11b24b8d5aa
merge?

diff -r 5f4724c13040 -r d13f5c7daddf 
linux-2.6-xen-sparse/arch/xen/i386/kernel/mpparse.c
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/mpparse.c       Tue Aug 23 
08:40:58 2005
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/mpparse.c       Tue Aug 23 
08:41:18 2005
@@ -784,7 +784,9 @@
 
 void __init find_smp_config (void)
 {
+#ifndef CONFIG_XEN
        unsigned int address;
+#endif
 
        /*
         * FIXME: Linux assumes you have 640K of base ram..
diff -r 5f4724c13040 -r d13f5c7daddf 
linux-2.6-xen-sparse/arch/xen/i386/kernel/smpboot.c
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/smpboot.c       Tue Aug 23 
08:40:58 2005
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/smpboot.c       Tue Aug 23 
08:41:18 2005
@@ -1604,6 +1604,9 @@
        unbind_ipi_from_irq(CALL_FUNCTION_VECTOR);
 }
 
+extern void local_setup_timer_irq(void);
+extern void local_teardown_timer_irq(void);
+
 void smp_suspend(void)
 {
        /* XXX todo: take down time and ipi's on all cpus */
diff -r 5f4724c13040 -r d13f5c7daddf 
linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c
--- a/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c     Tue Aug 23 08:40:58 2005
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c     Tue Aug 23 08:41:18 2005
@@ -435,9 +435,11 @@
     unbind_evtchn_from_irq(evtchn);
 }
 
+#ifdef CONFIG_SMP
 static void do_nothing_function(void *ign)
 {
 }
+#endif
 
 /* Rebind an evtchn so that it gets delivered to a specific cpu */
 static void rebind_irq_to_cpu(unsigned irq, unsigned tcpu)
diff -r 5f4724c13040 -r d13f5c7daddf 
linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c        Tue Aug 23 
08:40:58 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c        Tue Aug 23 
08:41:18 2005
@@ -11,6 +11,8 @@
  * Copyright (c) 2005, Christopher Clark
  */
 
+#include <linux/spinlock.h>
+#include <asm-xen/balloon.h>
 #include "common.h"
 
 /*

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>