aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/k8.h
diff options
context:
space:
mode:
authorJaswinder Singh Rajput <jaswinder@kernel.org>2009-04-14 13:34:37 -0400
committerIngo Molnar <mingo@elte.hu>2009-04-15 06:12:36 -0400
commitb206525ad1f653b7da35f5827be93770d28eae11 (patch)
treefaee9afcfa87c4349ee70348a47da980f371dff9 /arch/x86/include/asm/k8.h
parent6265ff19ca08df0d96c859ae5e4dc2d9ad07070e (diff)
x86: k8 convert node_to_k8_nb_misc() from a macro to an inline function
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>
Diffstat (limited to 'arch/x86/include/asm/k8.h')
-rw-r--r--arch/x86/include/asm/k8.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/x86/include/asm/k8.h b/arch/x86/include/asm/k8.h
index c23b3d171be5..c2d1f3b58e5f 100644
--- a/arch/x86/include/asm/k8.h
+++ b/arch/x86/include/asm/k8.h
@@ -13,10 +13,15 @@ extern void k8_flush_garts(void);
13extern int k8_scan_nodes(unsigned long start, unsigned long end); 13extern int k8_scan_nodes(unsigned long start, unsigned long end);
14 14
15#ifdef CONFIG_K8_NB 15#ifdef CONFIG_K8_NB
16#define node_to_k8_nb_misc(node) \ 16static inline struct pci_dev *node_to_k8_nb_misc(int node)
17 (node < num_k8_northbridges) ? k8_northbridges[node] : NULL 17{
18 return (node < num_k8_northbridges) ? k8_northbridges[node] : NULL;
19}
18#else 20#else
19#define node_to_k8_nb_misc(node) NULL 21static inline struct pci_dev *node_to_k8_nb_misc(int node)
22{
23 return NULL;
24}
20#endif 25#endif
21 26
22 27