* [PATCH] eliminate duplicate rdpmc definition
@ 2005-05-12 8:48 Jan Beulich
0 siblings, 0 replies; only message in thread
From: Jan Beulich @ 2005-05-12 8:48 UTC (permalink / raw)
To: ak; +Cc: linux-kernel, discuss
[-- Attachment #1: Type: text/plain, Size: 816 bytes --]
(Note: Patch also attached because the inline version is certain to get
line wrapped.)
Eliminate duplicate definition of rdpmc in x86-64's mtrr.h.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
diff -Npru linux-2.6.12-rc4.base/include/asm-x86_64/msr.h linux-2.6.12-rc4/include/asm-x86_64/msr.h
--- linux-2.6.12-rc4.base/include/asm-x86_64/msr.h 2005-05-11 17:28:24.819299352 +0200
+++ linux-2.6.12-rc4/include/asm-x86_64/msr.h 2005-05-11 17:50:36.308882168 +0200
@@ -57,11 +57,6 @@
(val) = ((unsigned long)__a) | (((unsigned long)__d)<<32); \
} while(0)
-#define rdpmc(counter,low,high) \
- __asm__ __volatile__("rdpmc" \
- : "=a" (low), "=d" (high) \
- : "c" (counter))
-
#define write_tsc(val1,val2) wrmsr(0x10, val1, val2)
#define rdpmc(counter,low,high) \
[-- Attachment #2: linux-2.6.12-rc4-x86_64-rdpmc.patch --]
[-- Type: text/plain, Size: 790 bytes --]
(Note: Patch also attached because the inline version is certain to get
line wrapped.)
Eliminate duplicate definition of rdpmc in x86-64's mtrr.h.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
diff -Npru linux-2.6.12-rc4.base/include/asm-x86_64/msr.h linux-2.6.12-rc4/include/asm-x86_64/msr.h
--- linux-2.6.12-rc4.base/include/asm-x86_64/msr.h 2005-05-11 17:28:24.819299352 +0200
+++ linux-2.6.12-rc4/include/asm-x86_64/msr.h 2005-05-11 17:50:36.308882168 +0200
@@ -57,11 +57,6 @@
(val) = ((unsigned long)__a) | (((unsigned long)__d)<<32); \
} while(0)
-#define rdpmc(counter,low,high) \
- __asm__ __volatile__("rdpmc" \
- : "=a" (low), "=d" (high) \
- : "c" (counter))
-
#define write_tsc(val1,val2) wrmsr(0x10, val1, val2)
#define rdpmc(counter,low,high) \
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2005-05-12 8:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-05-12 8:48 [PATCH] eliminate duplicate rdpmc definition Jan Beulich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®