lkml.org 
[lkml]   [2009]   [Nov]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the kvm tree with Linus' tree
    Hi Avi,

    Today's linux-next merge of the kvm tree got a conflict in
    arch/powerpc/kvm/timing.h between commit
    38634e6769920929385f1ffc8820dc3e893cc630 ("powerpc/kvm: Remove
    problematic BUILD_BUG_ON statement") from Linus' tree and commit
    8976402d633b79683667c44ca8252f9b26eebe71 ("KVM: powerpc: Fix BUILD_BUG_ON
    condition") from the kvm tree.

    Just context changes. I fixed it up (see below) and can carry it for a
    while.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au

    diff --cc arch/powerpc/kvm/timing.h
    index 806ef67,a550f0f..0000000
    --- a/arch/powerpc/kvm/timing.h
    +++ b/arch/powerpc/kvm/timing.h
    @@@ -48,11 -48,7 +48,11 @@@ static inline void kvmppc_set_exit_type
    static inline void kvmppc_account_exit_stat(struct kvm_vcpu *vcpu, int type)
    {
    /* type has to be known at build time for optimization */
    +
    + /* The BUILD_BUG_ON below breaks in funny ways, commented out
    + * for now ... -BenH
    - BUILD_BUG_ON(__builtin_constant_p(type));
    + BUILD_BUG_ON(!__builtin_constant_p(type));
    + */
    switch (type) {
    case EXT_INTR_EXITS:
    vcpu->stat.ext_intr_exits++;


    \
     
     \ /
      Last update: 2009-11-06 01:23    [W:3.136 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site