lib/vdso: Mark do_hres() and do_coarse() as __always_inline

[linux-2.6-microblaze.git] / lib / vdso / gettimeofday.c

diff --git a/lib/vdso/gettimeofday.c b/lib/vdso/gettimeofday.c
index fac9e86..b453d24 100644 (file)
--- a/lib/vdso/gettimeofday.c
+++ b/lib/vdso/gettimeofday.c
@@ -38,7 +38,7 @@ u64 vdso_calc_delta(u64 cycles, u64 last, u64 mask, u32 mult)
 }
 #endif
 
-static int do_hres(const struct vdso_data *vd, clockid_t clk,
+static __always_inline int do_hres(const struct vdso_data *vd, clockid_t clk,
                   struct __kernel_timespec *ts)
 {
        const struct vdso_timestamp *vdso_ts = &vd->basetime[clk];
@@ -68,8 +68,8 @@ static int do_hres(const struct vdso_data *vd, clockid_t clk,
        return 0;
 }
 
-static int do_coarse(const struct vdso_data *vd, clockid_t clk,
-                     struct __kernel_timespec *ts)
+static __always_inline int do_coarse(const struct vdso_data *vd, clockid_t clk,
+                                    struct __kernel_timespec *ts)
 {
        const struct vdso_timestamp *vdso_ts = &vd->basetime[clk];
        u32 seq;
@@ -99,13 +99,15 @@ __cvdso_clock_gettime_common(clockid_t clock, struct __kernel_timespec *ts)
         */
        msk = 1U << clock;
        if (likely(msk & VDSO_HRES))
-               return do_hres(&vd[CS_HRES_COARSE], clock, ts);
+               vd = &vd[CS_HRES_COARSE];
        else if (msk & VDSO_COARSE)
                return do_coarse(&vd[CS_HRES_COARSE], clock, ts);
        else if (msk & VDSO_RAW)
-               return do_hres(&vd[CS_RAW], clock, ts);
+               vd = &vd[CS_RAW];
+       else
+               return -1;
 
-       return -1;
+       return do_hres(vd, clock, ts);
 }
 
 static __maybe_unused int