Merge branch 'master' into tk71

[mv-sheeva.git] / arch / sh / kernel / cpu / init.c

diff --git a/arch/sh/kernel/cpu/init.c b/arch/sh/kernel/cpu/init.c
index 97661061ff206866acdee52718188091273c206a..fac742e514eec3257ea493c14eb0100796c01cec 100644 (file)
--- a/arch/sh/kernel/cpu/init.c
+++ b/arch/sh/kernel/cpu/init.c
@@ -340,6 +340,8 @@ asmlinkage void __cpuinit cpu_init(void)
         */
        current_cpu_data.asid_cache = NO_CONTEXT;
 
+       current_cpu_data.phys_bits = __in_29bit_mode() ? 29 : 32;
+
        speculative_execution_init();
        expmask_init();