devcgroup: fix odd behaviour when writing 'a' to devices.allow

[linux-2.6-omap-h63xx.git] / include / asm-x86 / tsc.h

diff --git a/include/asm-x86/tsc.h b/include/asm-x86/tsc.h
index 7d3e27f7d484d8ce848951b4f0b48a4d285242c0..548873ab5fc1b0deabafc4b3dcbb23ee8cbf05db 100644 (file)
--- 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
@@ -42,7 +42,7 @@ static inline cycles_t vget_cycles(void)
        if (!cpu_has_tsc)
                return 0;
 #endif
-       return (cycles_t) __native_read_tsc();
+       return (cycles_t)__native_read_tsc();
 }
 
 extern void tsc_init(void);