Merge commit 'kumar/kumar-next' into next

diff --combined arch/powerpc/kernel/asm-offsets.c
index 9937fe44555f3d4e15cffa5a18d597231ca6040c,06958da94f17a0d176d5e3fa878565b5718d2ce2..19ee491e9e2380cb3b58c41ac761e7c389582342
--- 1/arch/powerpc/kernel/asm-offsets.c
--- 2/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@@ -23,6 -23,9 +23,6 @@@
  #include <linux/mm.h>
  #include <linux/suspend.h>
  #include <linux/hrtimer.h>
 -#ifdef CONFIG_KVM
 -#include <linux/kvm_host.h>
 -#endif
  #ifdef CONFIG_PPC64
  #include <linux/time.h>
  #include <linux/hardirq.h>
@@@ -48,14 -51,15 +48,18 @@@
  #ifdef CONFIG_PPC_ISERIES
  #include <asm/iseries/alpaca.h>
  #endif
 +#ifdef CONFIG_KVM
 +#include <asm/kvm_44x.h>
 +#endif
  
  #if defined(CONFIG_BOOKE) || defined(CONFIG_40x)
  #include "head_booke.h"
  #endif
  
+ #if defined(CONFIG_FSL_BOOKE)
+ #include "../mm/mmu_decl.h"
+ #endif
+ 
  int main(void)
  {
        DEFINE(THREAD, offsetof(struct task_struct, thread));
@@@ -357,10 -361,12 +361,10 @@@
        DEFINE(PTE_SIZE, sizeof(pte_t));
  
  #ifdef CONFIG_KVM
 -      DEFINE(TLBE_BYTES, sizeof(struct tlbe));
 +      DEFINE(TLBE_BYTES, sizeof(struct kvmppc_44x_tlbe));
  
        DEFINE(VCPU_HOST_STACK, offsetof(struct kvm_vcpu, arch.host_stack));
        DEFINE(VCPU_HOST_PID, offsetof(struct kvm_vcpu, arch.host_pid));
 -      DEFINE(VCPU_SHADOW_TLB, offsetof(struct kvm_vcpu, arch.shadow_tlb));
 -      DEFINE(VCPU_SHADOW_MOD, offsetof(struct kvm_vcpu, arch.shadow_tlb_mod));
        DEFINE(VCPU_GPRS, offsetof(struct kvm_vcpu, arch.gpr));
        DEFINE(VCPU_LR, offsetof(struct kvm_vcpu, arch.lr));
        DEFINE(VCPU_CR, offsetof(struct kvm_vcpu, arch.cr));
@@@ -382,17 -388,9 +386,20 @@@
        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;
  }

diff --combined arch/powerpc/mm/mmu_decl.h
index ad123bced404a4cb56d467cdfbec04d761d9afef,d0bb69dc6278a67daa7dbfa230fb138ffbbfde22..d1f9c62dc177b527179a0db0c2b4ad7583fc85d7
--- 1/arch/powerpc/mm/mmu_decl.h
--- 2/arch/powerpc/mm/mmu_decl.h
+++ b/arch/powerpc/mm/mmu_decl.h
@@@ -30,11 -30,11 +30,11 @@@
  #if defined(CONFIG_40x) || defined(CONFIG_8xx)
  static inline void _tlbil_all(void)
  {
 -      asm volatile ("sync; tlbia; isync" : : : "memory")
 +      asm volatile ("sync; tlbia; isync" : : : "memory");
  }
  static inline void _tlbil_pid(unsigned int pid)
  {
 -      asm volatile ("sync; tlbia; isync" : : : "memory")
 +      asm volatile ("sync; tlbia; isync" : : : "memory");
  }
  #else /* CONFIG_40x || CONFIG_8xx */
  extern void _tlbil_all(void);
@@@ -47,7 -47,7 +47,7 @@@ extern void _tlbil_pid(unsigned int pid
  #ifdef CONFIG_8xx
  static inline void _tlbil_va(unsigned long address, unsigned int pid)
  {
 -      asm volatile ("tlbie %0; sync" : : "r" (address) : "memory")
 +      asm volatile ("tlbie %0; sync" : : "r" (address) : "memory");
  }
  #else /* CONFIG_8xx */
  extern void _tlbil_va(unsigned long address, unsigned int pid);
@@@ -75,6 -75,15 +75,15 @@@ extern void _tlbia(void)
  #endif /* CONFIG_PPC_MMU_NOHASH */
  
  #ifdef CONFIG_PPC32
+ 
+ struct tlbcam {
+       u32     MAS0;
+       u32     MAS1;
+       u32     MAS2;
+       u32     MAS3;
+       u32     MAS7;
+ };
+ 
  extern void mapin_ram(void);
  extern int map_page(unsigned long va, phys_addr_t pa, int flags);
  extern void setbat(int index, unsigned long virt, phys_addr_t phys,
@@@ -90,8 -99,6 +99,6 @@@ extern unsigned int rtas_data, rtas_siz
  struct hash_pte;
  extern struct hash_pte *Hash, *Hash_end;
  extern unsigned long Hash_size, Hash_mask;
- 
- extern unsigned int num_tlbcam_entries;
  #endif
  
  extern unsigned long ioremap_bot;