[Xen-changelog] Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1648.1.1, 2005/06/02 22:05:40+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
        into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xxx.bk



 arch/x86/x86_32/seg_fixup.c |    1 +
 include/xen/sched.h         |    5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)


diff -Nru a/xen/arch/x86/x86_32/seg_fixup.c b/xen/arch/x86/x86_32/seg_fixup.c
--- a/xen/arch/x86/x86_32/seg_fixup.c   2005-06-02 18:04:17 -04:00
+++ b/xen/arch/x86/x86_32/seg_fixup.c   2005-06-02 18:04:17 -04:00
@@ -28,6 +28,7 @@
 #include <xen/mm.h>
 #include <xen/perfc.h>
 #include <asm/processor.h>
+#include <asm/regs.h>
 #include <asm/x86_emulate.h>
 
 /* Make the scary benign errors go away. */
diff -Nru a/xen/include/xen/sched.h b/xen/include/xen/sched.h
--- a/xen/include/xen/sched.h   2005-06-02 18:04:17 -04:00
+++ b/xen/include/xen/sched.h   2005-06-02 18:04:17 -04:00
@@ -6,7 +6,6 @@
 #include <xen/types.h>
 #include <xen/spinlock.h>
 #include <xen/cache.h>
-#include <asm/regs.h>
 #include <xen/smp.h>
 #include <asm/page.h>
 #include <asm/processor.h>
@@ -167,8 +166,6 @@
     unsigned int xen_elf_image;
 };
 
-#include <asm/uaccess.h> /* for KERNEL_DS */
-
 extern struct domain idle0_domain;
 extern struct vcpu idle0_vcpu;
 
@@ -274,8 +271,6 @@
 /* Called by the scheduler to continue running the current vcpu. */
 extern void continue_running(
     struct vcpu *same);
-
-void domain_init(void);
 
 int idle_cpu(int cpu); /* Is CPU 'cpu' idle right now? */
 

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