diff options
| author | Hugh Dickins <hugh@veritas.com> | 2008-04-27 01:39:36 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-29 13:45:24 +0200 |
| commit | 9752082560b440e6a45624569d26802e20d1b8b4 (patch) | |
| tree | dc5f0358a164dda9b375272e888b9f2138463e54 /include/asm-x86 | |
| parent | x86: add more boot protocol documentation (diff) | |
| download | linux-9752082560b440e6a45624569d26802e20d1b8b4.tar.xz linux-9752082560b440e6a45624569d26802e20d1b8b4.zip | |
x86: vget_cycles() __always_inline
Mark vget_cycles() as __always_inline, so gcc is never tempted to make
the vsyscall vread_tsc() dive into kernel text, with resulting SIGSEGV.
This was a self-inflicted wound: I've not seen that happen with unhacked
sources; but for debug reasons I'd changed my x86/Makefile to compile
no-unit-at-a-time, and that in conjunction with OPTIMIZE_INLINING=y
ended up with vget_cycles() in kernel text. Perhaps it can happen
in other ways: safer to use __always_inline.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86')
| -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 d2d8eb5b55f5..548873ab5fc1 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 |