From 81590e66fc40fa60480f350ce9c4077ffdad1aa4 Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Sun, 27 Apr 2008 00:39:36 +0100 Subject: [PATCH] --- yaml --- r: 94836 b: refs/heads/master c: 9752082560b440e6a45624569d26802e20d1b8b4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-x86/tsc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 885ed2b7d792..5b6b23efcc0b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c0587e6e42c5b679234d3dffda8a888dc0ff9c1 +refs/heads/master: 9752082560b440e6a45624569d26802e20d1b8b4 diff --git a/trunk/include/asm-x86/tsc.h b/trunk/include/asm-x86/tsc.h index d2d8eb5b55f5..548873ab5fc1 100644 --- a/trunk/include/asm-x86/tsc.h +++ b/trunk/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