diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 09:03:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 09:03:19 -0700 |
| commit | 1f43c5393033de90bac4410352b1d2a69dcbe7ef (patch) | |
| tree | 3e6c3b9e9ea4dd6620a3b8332546a3cbbeddb1fd /include | |
| parent | c135b6592bd63925397e60425e0301f33f06c7a6 (diff) | |
| parent | e90955c26d8af318658c45caadb1d330ac6a506c (diff) | |
| download | linux-3.10-1f43c5393033de90bac4410352b1d2a69dcbe7ef.tar.gz linux-3.10-1f43c5393033de90bac4410352b1d2a69dcbe7ef.tar.bz2 linux-3.10-1f43c5393033de90bac4410352b1d2a69dcbe7ef.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
x86: fix PCI MSI breaks when booting with nosmp
x86: vget_cycles() __always_inline
x86: add more boot protocol documentation
bootprotocol: cleanup
x86: fix warning in "x86: clean up vSMP detection"
x86: !x & y typo in mtrr code
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/tsc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86/tsc.h b/include/asm-x86/tsc.h index d2d8eb5b55f..548873ab5fc 100644 --- a/include/asm-x86/tsc.h +++ b/include/asm-x86/tsc.h @@ -32,7 +32,7 @@ static inline cycles_t get_cycles(void) return ret; } -static inline cycles_t vget_cycles(void) +static __always_inline cycles_t vget_cycles(void) { /* * We only do VDSOs on TSC capable CPUs, so this shouldnt |