Re: [PATCH -tip] x86: k8.h reference to node in node_to_k8_nb_miscfor !CONFIG_K8_NB

From: Ingo Molnar
Date: Tue Apr 14 2009 - 12:53:10 EST



* Jaswinder Singh Rajput <jaswinder@xxxxxxxxxx> wrote:

> Add reference to node in node_to_k8_nb_misc for !CONFIG_K8_NB to make compiler happy.
>
> So fixes compiler warnings:
> arch/x86/kernel/cpu/intel_cacheinfo.c: In function âshow_cache_disableâ:
> arch/x86/kernel/cpu/intel_cacheinfo.c:712: warning: unused variable ânodeâ
> arch/x86/kernel/cpu/intel_cacheinfo.c: In function âstore_cache_disableâ:
> arch/x86/kernel/cpu/intel_cacheinfo.c:739: warning: unused variable ânodeâ
>
> Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@xxxxxxxxx>
> ---
> arch/x86/include/asm/k8.h | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/x86/include/asm/k8.h b/arch/x86/include/asm/k8.h
> index c23b3d1..c81e4ee 100644
> --- a/arch/x86/include/asm/k8.h
> +++ b/arch/x86/include/asm/k8.h
> @@ -16,7 +16,7 @@ extern int k8_scan_nodes(unsigned long start, unsigned long end);
> #define node_to_k8_nb_misc(node) \
> (node < num_k8_northbridges) ? k8_northbridges[node] : NULL
> #else
> -#define node_to_k8_nb_misc(node) NULL
> +#define node_to_k8_nb_misc(node) (node) ? NULL : NULL
> #endif

Ugh, that's very ugly. I gave you a proper solution:

>> The typical way to solve this is to add a dummy:
>>
>> (void)(cpu)
>>
>> use to the 'cpu' parameter to the macro definition - or,
>> (which is a much better solution), to convert it to an
>> inline function.

Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/