Re: [Xen-devel] xen pv_ops git merge conflicts unresolved?

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Tue, 2009-03-03 at 05:14 -0500, Marc - A. Dahlhaus [ Administration |
Westermann GmbH ] wrote:
> Hello Jeremy,
> 
> 
> it looks like there were some merge conflicts yesterday on the following
> commits/files and they didn't got resolved properly...

The below fixes the 32 bit build for me although I still get a crash on
boot.

diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
index bced8b9..6ae4d94 100644
--- a/arch/x86/kernel/ioport.c
+++ b/arch/x86/kernel/ioport.c
@@ -40,22 +40,11 @@ void native_set_io_bitmap(struct thread_struct *t,
 
        tss = &__get_cpu_var(init_tss);
 
-#ifdef CONFIG_X86_32
-       /*
-        * Sets the lazy trigger so that the next I/O operation will
-        * reload the correct bitmap.
-        * Reset the owner so that a process switch will not set
-        * tss->io_bitmap_base to IO_BITMAP_OFFSET.
-        */
-       tss->x86_tss.io_bitmap_base = INVALID_IO_BITMAP_OFFSET_LAZY;
-       tss->io_bitmap_owner = NULL;
-#else
        /* Update the TSS: */
        if (t->io_bitmap_ptr)
                memcpy(tss->io_bitmap, t->io_bitmap_ptr, bytes_updated);
        else
                memset(tss->io_bitmap, 0xff, bytes_updated);
-#endif
 }
 
 /*
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index 7dc903e..6c73ddd 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -443,7 +443,6 @@ int sys_clone(struct pt_regs *regs)
        return do_fork(clone_flags, newsp, regs, 0, parent_tidptr, 
child_tidptr);
 }
 
-/*
 int sys_execve(struct pt_regs *regs)
 {
        int error;



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