Skip to content

Commit

Permalink
x86: k8 convert node_to_k8_nb_misc() from a macro to an inline function
Browse files Browse the repository at this point in the history
Converting node_to_k8_nb_misc() from a macro to an inline function
makes compiler see the 'node' parameter in the !CONFIG_K8_NB too,
which eliminates these 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@gmail.com>
Cc: Andreas Herrmann <andreas.herrmann3@amd.com>
Cc: Mark Langsdorf <mark.langsdorf@amd.com>
LKML-Reference: <1239730477.2966.26.camel@ht.satnam>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Jaswinder Singh Rajput authored and Ingo Molnar committed Apr 15, 2009
1 parent 6265ff1 commit b206525
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions arch/x86/include/asm/k8.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,15 @@ extern void k8_flush_garts(void);
extern int k8_scan_nodes(unsigned long start, unsigned long end);

#ifdef CONFIG_K8_NB
#define node_to_k8_nb_misc(node) \
(node < num_k8_northbridges) ? k8_northbridges[node] : NULL
static inline struct pci_dev *node_to_k8_nb_misc(int node)
{
return (node < num_k8_northbridges) ? k8_northbridges[node] : NULL;
}
#else
#define node_to_k8_nb_misc(node) NULL
static inline struct pci_dev *node_to_k8_nb_misc(int node)
{
return NULL;
}
#endif


Expand Down

0 comments on commit b206525

Please sign in to comment.