aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2005-09-12 12:49:24 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-12 13:50:56 -0400
commit2e8ad43ec07545780ce7992cb18e2d82c7abd24c (patch)
tree10d7cb19a4be3b19189d173a9fa544b63b1c5932
parentc1a71a1ede8f743209237b2736893f3aebe13bb0 (diff)
[PATCH] x86-64: Prevent gcc 4 from optimizing away vsyscalls
They were previously static. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/x86_64/kernel/vsyscall.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86_64/kernel/vsyscall.c b/arch/x86_64/kernel/vsyscall.c
index 2e5734425949..70a0bd16085f 100644
--- a/arch/x86_64/kernel/vsyscall.c
+++ b/arch/x86_64/kernel/vsyscall.c
@@ -107,7 +107,7 @@ static force_inline long time_syscall(long *t)
107 return secs; 107 return secs;
108} 108}
109 109
110static int __vsyscall(0) vgettimeofday(struct timeval * tv, struct timezone * tz) 110int __vsyscall(0) vgettimeofday(struct timeval * tv, struct timezone * tz)
111{ 111{
112 if (unlikely(!__sysctl_vsyscall)) 112 if (unlikely(!__sysctl_vsyscall))
113 return gettimeofday(tv,tz); 113 return gettimeofday(tv,tz);
@@ -120,7 +120,7 @@ static int __vsyscall(0) vgettimeofday(struct timeval * tv, struct timezone * tz
120 120
121/* This will break when the xtime seconds get inaccurate, but that is 121/* This will break when the xtime seconds get inaccurate, but that is
122 * unlikely */ 122 * unlikely */
123static time_t __vsyscall(1) vtime(time_t *t) 123time_t __vsyscall(1) vtime(time_t *t)
124{ 124{
125 if (unlikely(!__sysctl_vsyscall)) 125 if (unlikely(!__sysctl_vsyscall))
126 return time_syscall(t); 126 return time_syscall(t);
@@ -129,12 +129,12 @@ static time_t __vsyscall(1) vtime(time_t *t)
129 return __xtime.tv_sec; 129 return __xtime.tv_sec;
130} 130}
131 131
132static long __vsyscall(2) venosys_0(void) 132long __vsyscall(2) venosys_0(void)
133{ 133{
134 return -ENOSYS; 134 return -ENOSYS;
135} 135}
136 136
137static long __vsyscall(3) venosys_1(void) 137long __vsyscall(3) venosys_1(void)
138{ 138{
139 return -ENOSYS; 139 return -ENOSYS;
140} 140}