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