Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1206081

Re: linux-next: manual merge of the xen-tip tree with the tip tree

Show all headers | View raw

On 08/12/2015 01:09 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the xen-tip tree got a conflict in:
>
>    arch/x86/xen/enlighten.c
>
> between commit:
>
>    9261e050b686 ("x86/asm/tsc, x86/paravirt: Remove read_tsc() and read_tscp() paravirt hooks")
>
> from the tip tree and commit:
>
>    cd6f350a5460 ("xen/PMU: Initialization code for Xen PMU")
>
> from the xen-tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks, this looks good.

Incidentally, 11276d53 ("locking/static_keys: Add a new static_key 
interface") breaks old-ish compilers (gcc version 4.4.4 20100503 (Red 
Hat 4.4.4-2) (GCC)):



   CC      arch/x86/kernel/nmi.o
In file included from 
/home/build/linux-boris/include/linux/jump_label.h:109,
                  from 
/home/build/linux-boris/arch/x86/include/asm/spinlock.h:5,
                  from /home/build/linux-boris/include/linux/spinlock.h:88,
                  from /home/build/linux-boris/arch/x86/kernel/nmi.c:14:
/home/build/linux-boris/arch/x86/include/asm/jump_label.h: In function 
‘nmi_handle’:
/home/build/linux-boris/arch/x86/include/asm/jump_label.h:21: warning: 
asm operand 0 probably doesn’t match constraints
/home/build/linux-boris/arch/x86/include/asm/jump_label.h:21: error: 
impossible constraint in ‘asm’
make[3]: *** [arch/x86/kernel/nmi.o] Error 1
make[2]: *** [arch/x86/kernel] Error 2
make[1]: *** [arch/x86] Error 2


-boris

>
> -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc 
> arch/x86/xen/enlighten.c index d9cfa452da9d,a1c2e46206a9..000000000000 
> --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@@ 
> -1215,8 -1179,11 +1219,8 @@@ static const struct pv_cpu_ops xen_cpu_ 
> .read_msr = xen_read_msr_safe, .write_msr = xen_write_msr_safe, - 
> .read_pmc = native_read_pmc, - .read_tsc = native_read_tsc, + 
> .read_pmc = xen_read_pmc, - .read_tscp = native_read_tscp, - .iret = 
> xen_iret, #ifdef CONFIG_X86_64 .usergs_sysret32 = xen_sysret32,

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the xen-tip tree with the tip tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-12 07:20 +0200
  Re: linux-next: manual merge of the xen-tip tree with the tip tree Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2015-08-12 15:30 +0200
    Re: linux-next: manual merge of the xen-tip tree with the tip tree Peter Zijlstra <peterz@infradead.org> - 2015-08-12 19:30 +0200
      Re: linux-next: manual merge of the xen-tip tree with the tip tree Peter Zijlstra <peterz@infradead.org> - 2015-08-12 19:40 +0200
      Re: linux-next: manual merge of the xen-tip tree with the tip tree Peter Zijlstra <peterz@infradead.org> - 2015-08-12 19:50 +0200
        Re: linux-next: manual merge of the xen-tip tree with the tip tree Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2015-08-12 20:20 +0200
          Re: linux-next: manual merge of the xen-tip tree with the tip tree "H. Peter Anvin" <hpa@zytor.com> - 2015-08-12 20:30 +0200
            Re: linux-next: manual merge of the xen-tip tree with the tip tree Peter Zijlstra <peterz@infradead.org> - 2015-08-12 20:40 +0200
              Re: linux-next: manual merge of the xen-tip tree with the tip tree Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2015-08-12 20:50 +0200
                Re: linux-next: manual merge of the xen-tip tree with the tip tree Peter Zijlstra <peterz@infradead.org> - 2015-08-12 21:10 +0200
                Re: linux-next: manual merge of the xen-tip tree with the tip tree Ingo Molnar <mingo@kernel.org> - 2015-08-13 08:50 +0200
          Re: linux-next: manual merge of the xen-tip tree with the tip tree Andy Lutomirski <luto@amacapital.net> - 2015-08-12 20:30 +0200
            Re: linux-next: manual merge of the xen-tip tree with the tip tree Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2015-08-12 20:40 +0200

csiph-web