diff options
Diffstat (limited to 'arch/sparc64/kernel/setup.c')
-rw-r--r-- | arch/sparc64/kernel/setup.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c index 2d64320d3a4d..7f02c8f71df6 100644 --- a/arch/sparc64/kernel/setup.c +++ b/arch/sparc64/kernel/setup.c | |||
@@ -504,9 +504,12 @@ static void __init per_cpu_patch(void) | |||
504 | if (tlb_type == spitfire && !this_is_starfire) | 504 | if (tlb_type == spitfire && !this_is_starfire) |
505 | return; | 505 | return; |
506 | 506 | ||
507 | __asm__ ("rdpr %%ver, %0" : "=r" (ver)); | 507 | is_jbus = 0; |
508 | is_jbus = ((ver >> 32) == __JALAPENO_ID || | 508 | if (tlb_type != hypervisor) { |
509 | (ver >> 32) == __SERRANO_ID); | 509 | __asm__ ("rdpr %%ver, %0" : "=r" (ver)); |
510 | is_jbus = ((ver >> 32) == __JALAPENO_ID || | ||
511 | (ver >> 32) == __SERRANO_ID); | ||
512 | } | ||
510 | 513 | ||
511 | p = &__cpuid_patch; | 514 | p = &__cpuid_patch; |
512 | while (p < &__cpuid_patch_end) { | 515 | while (p < &__cpuid_patch_end) { |