
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

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>
---

 arch/ppc64/kernel/prom.c |    2 ++
 1 files changed, 2 insertions(+)

diff -puN arch/ppc64/kernel/prom.c~ppc64-fix-config_altivec-not-set arch/ppc64/kernel/prom.c
--- devel/arch/ppc64/kernel/prom.c~ppc64-fix-config_altivec-not-set	2005-07-30 13:13:18.000000000 -0700
+++ devel-akpm/arch/ppc64/kernel/prom.c	2005-07-30 13:13:18.000000000 -0700
@@ -916,6 +916,7 @@ static int __init early_init_dt_scan_cpu
 		}
 	}
 
+#ifdef CONFIG_ALTIVEC
 	/* Check if we have a VMX and eventually update CPU features */
 	prop = (u32 *)get_flat_dt_prop(node, "ibm,vmx", NULL);
 	if (prop && (*prop) > 0) {
@@ -929,6 +930,7 @@ static int __init early_init_dt_scan_cpu
 		cur_cpu_spec->cpu_features |= CPU_FTR_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
_
