Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

[PATCH] ppc64: Fix CONFIG_ALTIVEC not set

The code that sets the altivec capability of the CPU based on firmware
informations can enable altivec when the kernel has CONFIG_ALTIVEC
disabled.  This results in "interesting" crashes.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Benjamin Herrenschmidt 20 years ago
parent
1caf1f0f18
commit
57ee67af35
1 changed files with 2 additions and 0 deletions
Unified View Show Diff Stats
  1. 2 0
      arch/ppc64/kernel/prom.c

+ 2 - 0
arch/ppc64/kernel/prom.c
View File 

@@ -916,6 +916,7 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
 
 		}
 
 		}
 
 	}
 
 	}
 
 
 
+#ifdef CONFIG_ALTIVEC
 
 	/* Check if we have a VMX and eventually update CPU features */
 
 	/* Check if we have a VMX and eventually update CPU features */
 
 	prop = (u32 *)get_flat_dt_prop(node, "ibm,vmx", NULL);
 
 	prop = (u32 *)get_flat_dt_prop(node, "ibm,vmx", NULL);
 
 	if (prop && (*prop) > 0) {
 
 	if (prop && (*prop) > 0) {
 
@@ -929,6 +930,7 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
 
 		cur_cpu_spec->cpu_features |= CPU_FTR_ALTIVEC;
 
 		cur_cpu_spec->cpu_features |= CPU_FTR_ALTIVEC;
 
 		cur_cpu_spec->cpu_user_features |= PPC_FEATURE_HAS_ALTIVEC;
 
 		cur_cpu_spec->cpu_user_features |= PPC_FEATURE_HAS_ALTIVEC;
 
 	}
 
 	}
 
+#endif /* CONFIG_ALTIVEC */
 
 
 
 	/*
 
 	/*
 
 	 * Check for an SMT capable CPU and set the CPU feature. We do
 
 	 * Check for an SMT capable CPU and set the CPU feature. We do