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

Commit 2c8bc944 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Use standard __always_inline in vsyscall.c 



Replacing the old home brewn __force_inline.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 487472bc

arch/x86_64/kernel/vsyscall.c

+5 −6
Original line number Diff line number Diff line
@@ -35,14 +35,13 @@ 
#include <asm/io.h>



#define __vsyscall(nr) __attribute__ ((unused,__section__(".vsyscall_" #nr)))

#define force_inline __attribute__((always_inline)) inline



int __sysctl_vsyscall __section_sysctl_vsyscall = 1;

seqlock_t __xtime_lock __section_xtime_lock = SEQLOCK_UNLOCKED;



#include <asm/unistd.h>



static force_inline void timeval_normalize(struct timeval * tv)

static __always_inline void timeval_normalize(struct timeval * tv)

{

	time_t __sec;
@@ -53,7 +52,7 @@ static force_inline void timeval_normalize(struct timeval * tv) 
	}

}



static force_inline void do_vgettimeofday(struct timeval * tv)

static __always_inline void do_vgettimeofday(struct timeval * tv)

{

	long sequence, t;

	unsigned long sec, usec;
@@ -83,12 +82,12 @@ static force_inline void do_vgettimeofday(struct timeval * tv) 
}



/* RED-PEN may want to readd seq locking, but then the variable should be write-once. */

static force_inline void do_get_tz(struct timezone * tz)

static __always_inline void do_get_tz(struct timezone * tz)

{

	*tz = __sys_tz;

}



static force_inline int gettimeofday(struct timeval *tv, struct timezone *tz)

static __always_inline int gettimeofday(struct timeval *tv, struct timezone *tz)

{

	int ret;

	asm volatile("vsysc2: syscall"
@@ -97,7 +96,7 @@ static force_inline int gettimeofday(struct timeval *tv, struct timezone *tz) 
	return ret;

}



static force_inline long time_syscall(long *t)

static __always_inline long time_syscall(long *t)

{

	long secs;

	asm volatile("vsysc1: syscall"