aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86_64/msr.h
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2005-09-12 12:49:24 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-12 13:50:56 -0400
commit9c0aa0f9a16557a3dd9b7b0d39bc67ddf1fa0b32 (patch)
tree7f56da5c81c9e8751a0c85ba7e2495e0616971a8 /include/asm-x86_64/msr.h
parent47e5701e37cf10948c3f2952870d9f18b6e84965 (diff)
[PATCH] Replace extern inline with static inline in asm-x86_64/*
They should be identical in the kernel now, but this makes it consistent with other code. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-x86_64/msr.h')
-rw-r--r--include/asm-x86_64/msr.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-x86_64/msr.h b/include/asm-x86_64/msr.h
index ba15279a79d0..15a6ef7cf3d3 100644
--- a/include/asm-x86_64/msr.h
+++ b/include/asm-x86_64/msr.h
@@ -64,7 +64,7 @@
64 : "=a" (low), "=d" (high) \ 64 : "=a" (low), "=d" (high) \
65 : "c" (counter)) 65 : "c" (counter))
66 66
67extern inline void cpuid(int op, unsigned int *eax, unsigned int *ebx, 67static inline void cpuid(int op, unsigned int *eax, unsigned int *ebx,
68 unsigned int *ecx, unsigned int *edx) 68 unsigned int *ecx, unsigned int *edx)
69{ 69{
70 __asm__("cpuid" 70 __asm__("cpuid"
@@ -90,7 +90,7 @@ static inline void cpuid_count(int op, int count, int *eax, int *ebx, int *ecx,
90/* 90/*
91 * CPUID functions returning a single datum 91 * CPUID functions returning a single datum
92 */ 92 */
93extern inline unsigned int cpuid_eax(unsigned int op) 93static inline unsigned int cpuid_eax(unsigned int op)
94{ 94{
95 unsigned int eax; 95 unsigned int eax;
96 96
@@ -100,7 +100,7 @@ extern inline unsigned int cpuid_eax(unsigned int op)
100 : "bx", "cx", "dx"); 100 : "bx", "cx", "dx");
101 return eax; 101 return eax;
102} 102}
103extern inline unsigned int cpuid_ebx(unsigned int op) 103static inline unsigned int cpuid_ebx(unsigned int op)
104{ 104{
105 unsigned int eax, ebx; 105 unsigned int eax, ebx;
106 106
@@ -110,7 +110,7 @@ extern inline unsigned int cpuid_ebx(unsigned int op)
110 : "cx", "dx" ); 110 : "cx", "dx" );
111 return ebx; 111 return ebx;
112} 112}
113extern inline unsigned int cpuid_ecx(unsigned int op) 113static inline unsigned int cpuid_ecx(unsigned int op)
114{ 114{
115 unsigned int eax, ecx; 115 unsigned int eax, ecx;
116 116
@@ -120,7 +120,7 @@ extern inline unsigned int cpuid_ecx(unsigned int op)
120 : "bx", "dx" ); 120 : "bx", "dx" );
121 return ecx; 121 return ecx;
122} 122}
123extern inline unsigned int cpuid_edx(unsigned int op) 123static inline unsigned int cpuid_edx(unsigned int op)
124{ 124{
125 unsigned int eax, edx; 125 unsigned int eax, edx;
126 126