Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[sfrench/cifs-2.6.git] / arch / powerpc / kernel / vdso.c

diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index b67db22e102dd93dc11ec131ac7e942cf6de3d5c..1b2076f049cecaf954b111df7a6a07b964258c52 100644 (file)
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -723,9 +723,7 @@ int __cpuinit vdso_getcpu_init(void)
 
        val = (cpu & 0xfff) | ((node & 0xffff) << 16);
        mtspr(SPRN_SPRG3, val);
-#ifdef CONFIG_KVM_BOOK3S_HANDLER
-       get_paca()->kvm_hstate.sprg3 = val;
-#endif
+       get_paca()->sprg3 = val;
 
        put_cpu();