From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue, 13 Jan 2009 02:59:03 +0000 (+1100)
Subject: Merge commit 'kumar/kumar-next' into next
X-Git-Tag: v2.6.29-rc2~76^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=30aae739a9eb6db31ad7b08dac44bd302f41c709;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge commit 'kumar/kumar-next' into next
---

30aae739a9eb6db31ad7b08dac44bd302f41c709
diff --cc arch/powerpc/kernel/asm-offsets.c
index 9937fe4,06958da..19ee491
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@@ -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;
  }