Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57ee67af authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Linus Torvalds
Browse files

[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: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1caf1f0f

arch/ppc64/kernel/prom.c

+2 −0
Original line number Diff line number Diff line
@@ -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 */

	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_cpus(unsigned long node, 
		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