xen pv_ops git merge conflicts unresolved?

xen pv_ops git merge conflicts unresolved?

[Marc - A. Dahlhaus [ Administration | Westermann GmbH ]]

Hello Jeremy,


it looks like there were some merge conflicts yesterday on the following
commits/files and they didn't got resolved properly...

commit 5b82413a71a831afe91f3b3b7242deea06d65a8c

Conflicts:
arch/x86/kernel/ioport.c
arch/x86/kernel/process_64.c
arch/x86/mm/pgtable.c
arch/x86/xen/Kconfig


commit c98c8642f3d2df5567404f348c4d370c8ccc0846

Conflicts:
arch/x86/kernel/process_32.c


A build fails now with:

  CC      arch/x86/kernel/process_32.o
arch/x86/kernel/process_32.c:461:3: warning: "/*" within comment
arch/x86/kernel/process_32.c:462: error: expected ')' before '(' token
arch/x86/kernel/process_32.c:463: error: expected identifier or '('
before '}' token
arch/x86/kernel/process_32.c:464: warning: data definition has no type
or storage class
arch/x86/kernel/process_32.c:464: warning: type defaults to 'int' in
declaration of 'putname'
arch/x86/kernel/process_32.c:464: warning: parameter names (without
types) in function declaration
arch/x86/kernel/process_32.c:464: error: conflicting types for 'putname'
include/linux/fs.h:1734: error: previous declaration of 'putname' was
here
arch/x86/kernel/process_32.c:465: error: expected '=', ',', ';', 'asm'
or '__attribute__' before ':' token
arch/x86/kernel/process_32.c:467: error: expected identifier or '('
before '}' token
make[1]: *** [arch/x86/kernel/process_32.o] Error 1
make: *** [arch/x86/kernel] Error 2


Marc

Re: xen pv_ops git merge conflicts unresolved?

[Ian Campbell]

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;

Re: xen pv_ops git merge conflicts unresolved?

[Jeremy Fitzhardinge]

Ian Campbell wrote:
> 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.
>   

Thanks for the fixup.  I probably shouldn't have been operating 
machinery yesterday.

The crash is probably because I committed the e820 memory rearranging 
stuff into the wrong branch, but something may have broken us from 
tip/master as well.

    J