From: Benjamin Herrenschmidt Date: Wed, 1 Nov 2006 04:53:00 +0000 (+1100) Subject: [POWERPC] pmac_feature_call checks platform X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0eb2e6019ae8e76a537bdca07b31e1524a3bba48;p=openwrt%2Fstaging%2Fblogic.git [POWERPC] pmac_feature_call checks platform This patch makes sure that a caller of pmac_call_feature() won't try to call into ppc_md.feature_call of another platform, which might happen if some powermac drivers are loaded on non-powermac machines. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras --- diff --git a/include/asm-powerpc/pmac_feature.h b/include/asm-powerpc/pmac_feature.h index d3599cc9aa74..d43d91beba9b 100644 --- a/include/asm-powerpc/pmac_feature.h +++ b/include/asm-powerpc/pmac_feature.h @@ -146,7 +146,7 @@ struct device_node; static inline long pmac_call_feature(int selector, struct device_node* node, long param, long value) { - if (!ppc_md.feature_call) + if (!ppc_md.feature_call || !machine_is(powermac)) return -ENODEV; return ppc_md.feature_call(selector, node, param, value); }