]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge commit 'kumar/kumar-next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 13 Jan 2009 02:59:03 +0000 (13:59 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 13 Jan 2009 02:59:03 +0000 (13:59 +1100)
1  2 
arch/powerpc/kernel/asm-offsets.c
arch/powerpc/mm/mmu_decl.h

index 9937fe44555f3d4e15cffa5a18d597231ca6040c,06958da94f17a0d176d5e3fa878565b5718d2ce2..19ee491e9e2380cb3b58c41ac761e7c389582342
@@@ -382,17 -388,9 +386,20 @@@ int main(void
        DEFINE(PGD_T_LOG2, PGD_T_LOG2);
        DEFINE(PTE_T_LOG2, PTE_T_LOG2);
  #endif
+ #ifdef CONFIG_FSL_BOOKE
+       DEFINE(TLBCAM_SIZE, sizeof(struct tlbcam));
+ #endif
  
 +#ifdef CONFIG_KVM_EXIT_TIMING
 +      DEFINE(VCPU_TIMING_EXIT_TBU, offsetof(struct kvm_vcpu,
 +                                              arch.timing_exit.tv32.tbu));
 +      DEFINE(VCPU_TIMING_EXIT_TBL, offsetof(struct kvm_vcpu,
 +                                              arch.timing_exit.tv32.tbl));
 +      DEFINE(VCPU_TIMING_LAST_ENTER_TBU, offsetof(struct kvm_vcpu,
 +                                      arch.timing_last_enter.tv32.tbu));
 +      DEFINE(VCPU_TIMING_LAST_ENTER_TBL, offsetof(struct kvm_vcpu,
 +                                      arch.timing_last_enter.tv32.tbl));
 +#endif
 +
        return 0;
  }
Simple merge