lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/detect-hyper', 'x86/doc', 'x86/dumpstack', 'x86/early-printk', 'x86/fpu', 'x86/idle', 'x86/io', 'x86/memory-corruption-check', 'x86/microcode', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/pat2', 'x86/pci-ioapic-boot-irq-quirks', 'x86/ptrace', 'x86/quirks', 'x86/reboot', 'x86/setup-memory', 'x86/signal', 'x86/sparse-fixes', 'x86/time', 'x86/uv' and 'x86/xen' into x86/core

Browse Source
This commit is contained in:
Ingo Molnar
2008-12-23 16:27:23 +01:00
parent 3d44cc3e01 1ccedb7cdb 34945ede31 d437797406 c415b3dce3 beeb4195cb f269b07e86 4e42ebd57b e1286f2c68 878719e831 fd28a5b58d adf77bac05 8f2466f45f 93093d099e bb5574608a f34a10bd9f b6fd6f2673 30604bb410 5b9a0e14eb 67bac792cd 7a9787e1eb f4166c54bf 69b88afa8d 8daa19051e 3e1e9002aa 8403295e0f 4db646b1af 205516c12d c8182f0016 ecbf29cdb3
commit fa623d1b02
173 changed files with 4121 additions and 3195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/x86/include/asm/msr.h
View File

@@ -22,10 +22,10 @@ static inline unsigned long long native_read_tscp(unsigned int *aux)
}
/*
* i386 calling convention returns 64-bit value in edx:eax, while
* x86_64 returns at rax. Also, the "A" constraint does not really
* mean rdx:rax in x86_64, so we need specialized behaviour for each
* architecture
* both i386 and x86_64 returns 64-bit value in edx:eax, but gcc's "A"
* constraint has different meanings. For i386, "A" means exactly
* edx:eax, while for x86_64 it doesn't mean rdx:rax or edx:eax. Instead,
* it means rax *or* rdx.
*/
#ifdef CONFIG_X86_64
#define DECLARE_ARGS(val, low, high) unsigned low, high
@@ -181,10 +181,10 @@ static inline int rdmsrl_amd_safe(unsigned msr, unsigned long long *p)
}
#define rdtscl(low) \
((low) = (u32)native_read_tsc())
((low) = (u32)__native_read_tsc())
#define rdtscll(val) \
((val) = native_read_tsc())
((val) = __native_read_tsc())
#define rdpmc(counter, low, high) \
do { \