diff options
author | Paul Mackerras <paulus@samba.org> | 2005-11-09 23:54:00 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-09 23:54:00 -0500 |
commit | 0c95fbb25602caa02ef697c3852cd61f9829e6ff (patch) | |
tree | cdab09f60b9bf00864af24fcf1da408b07b91aa1 /arch/powerpc | |
parent | 49b09853df1a303876b82a6480efb2f7b45ef041 (diff) | |
parent | 06a98dba0d4b4f2f9b1f35f636beb166d6cbde34 (diff) |
Merge git://oak/home/sfr/kernels/iseries/work
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/kernel/prom.c | 6 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/setup.c | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 6391a4a0709a..6a5b468edb4d 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c | |||
@@ -1080,9 +1080,9 @@ void __init unflatten_device_tree(void) | |||
1080 | static int __init early_init_dt_scan_cpus(unsigned long node, | 1080 | static int __init early_init_dt_scan_cpus(unsigned long node, |
1081 | const char *uname, int depth, void *data) | 1081 | const char *uname, int depth, void *data) |
1082 | { | 1082 | { |
1083 | char *type = of_get_flat_dt_prop(node, "device_type", NULL); | ||
1084 | u32 *prop; | 1083 | u32 *prop; |
1085 | unsigned long size = 0; | 1084 | unsigned long size; |
1085 | char *type = of_get_flat_dt_prop(node, "device_type", &size); | ||
1086 | 1086 | ||
1087 | /* We are scanning "cpu" nodes only */ | 1087 | /* We are scanning "cpu" nodes only */ |
1088 | if (type == NULL || strcmp(type, "cpu") != 0) | 1088 | if (type == NULL || strcmp(type, "cpu") != 0) |
@@ -1108,7 +1108,7 @@ static int __init early_init_dt_scan_cpus(unsigned long node, | |||
1108 | 1108 | ||
1109 | #ifdef CONFIG_ALTIVEC | 1109 | #ifdef CONFIG_ALTIVEC |
1110 | /* Check if we have a VMX and eventually update CPU features */ | 1110 | /* Check if we have a VMX and eventually update CPU features */ |
1111 | prop = (u32 *)of_get_flat_dt_prop(node, "ibm,vmx", &size); | 1111 | prop = (u32 *)of_get_flat_dt_prop(node, "ibm,vmx", NULL); |
1112 | if (prop && (*prop) > 0) { | 1112 | if (prop && (*prop) > 0) { |
1113 | cur_cpu_spec->cpu_features |= CPU_FTR_ALTIVEC; | 1113 | cur_cpu_spec->cpu_features |= CPU_FTR_ALTIVEC; |
1114 | cur_cpu_spec->cpu_user_features |= PPC_FEATURE_HAS_ALTIVEC; | 1114 | cur_cpu_spec->cpu_user_features |= PPC_FEATURE_HAS_ALTIVEC; |
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index 1f338341d8f2..6a29f301436b 100644 --- a/arch/powerpc/platforms/iseries/setup.c +++ b/arch/powerpc/platforms/iseries/setup.c | |||
@@ -704,7 +704,6 @@ static void iseries_shared_idle(void) | |||
704 | 704 | ||
705 | static void iseries_dedicated_idle(void) | 705 | static void iseries_dedicated_idle(void) |
706 | { | 706 | { |
707 | long oldval; | ||
708 | set_thread_flag(TIF_POLLING_NRFLAG); | 707 | set_thread_flag(TIF_POLLING_NRFLAG); |
709 | 708 | ||
710 | while (1) { | 709 | while (1) { |