aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r--arch/powerpc/kernel/prom.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 1bf3642cb859..fd3bcb4a9e9f 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -1084,9 +1084,9 @@ void __init unflatten_device_tree(void)
1084static int __init early_init_dt_scan_cpus(unsigned long node, 1084static int __init early_init_dt_scan_cpus(unsigned long node,
1085 const char *uname, int depth, void *data) 1085 const char *uname, int depth, void *data)
1086{ 1086{
1087 char *type = of_get_flat_dt_prop(node, "device_type", NULL);
1088 u32 *prop; 1087 u32 *prop;
1089 unsigned long size = 0; 1088 unsigned long size;
1089 char *type = of_get_flat_dt_prop(node, "device_type", &size);
1090 1090
1091 /* We are scanning "cpu" nodes only */ 1091 /* We are scanning "cpu" nodes only */
1092 if (type == NULL || strcmp(type, "cpu") != 0) 1092 if (type == NULL || strcmp(type, "cpu") != 0)
@@ -1112,7 +1112,7 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
1112 1112
1113#ifdef CONFIG_ALTIVEC 1113#ifdef CONFIG_ALTIVEC
1114 /* Check if we have a VMX and eventually update CPU features */ 1114 /* Check if we have a VMX and eventually update CPU features */
1115 prop = (u32 *)of_get_flat_dt_prop(node, "ibm,vmx", &size); 1115 prop = (u32 *)of_get_flat_dt_prop(node, "ibm,vmx", NULL);
1116 if (prop && (*prop) > 0) { 1116 if (prop && (*prop) > 0) {
1117 cur_cpu_spec->cpu_features |= CPU_FTR_ALTIVEC; 1117 cur_cpu_spec->cpu_features |= CPU_FTR_ALTIVEC;
1118 cur_cpu_spec->cpu_user_features |= PPC_FEATURE_HAS_ALTIVEC; 1118 cur_cpu_spec->cpu_user_features |= PPC_FEATURE_HAS_ALTIVEC;