Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cde227af authored by mao, bibo's avatar mao, bibo Committed by Linus Torvalds
Browse files

[PATCH] x86_64: inline function prefix with __always_inline in vsyscall 



In vsyscall function do_vgettimeofday(), some functions are declared as
inlined, which is a hint for gcc to compile the function inlined but it
not forced.  Sometimes compiler does not compile the function as
inlined, so here inline is replaced by __always_inline prefix.

It does not happen in gcc compiler actually, but it possibly happens.

Signed-off-by: default avatarbibo mao <bibo.mao@intel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 44b940c2

include/asm-x86_64/io.h

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static inline __u16 __readw(const volatile void __iomem *addr) 
{

	return *(__force volatile __u16 *)addr;

}

static inline __u32 __readl(const volatile void __iomem *addr)

static __always_inline __u32 __readl(const volatile void __iomem *addr)

{

	return *(__force volatile __u32 *)addr;

}

include/linux/seqlock.h

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static inline int write_tryseqlock(seqlock_t *sl) 
}



/* Start of read calculation -- fetch last complete writer token */

static inline unsigned read_seqbegin(const seqlock_t *sl)

static __always_inline unsigned read_seqbegin(const seqlock_t *sl)

{

	unsigned ret = sl->sequence;

	smp_rmb();
@@ -88,7 +88,7 @@ static inline unsigned read_seqbegin(const seqlock_t *sl) 
 *    

 * Using xor saves one conditional branch.

 */

static inline int read_seqretry(const seqlock_t *sl, unsigned iv)

static __always_inline int read_seqretry(const seqlock_t *sl, unsigned iv)

{

	smp_rmb();

	return (iv & 1) | (sl->sequence ^ iv);