diff options
author | Andi Kleen <ak@suse.de> | 2005-09-12 12:49:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 13:50:56 -0400 |
commit | 2e8ad43ec07545780ce7992cb18e2d82c7abd24c (patch) | |
tree | 10d7cb19a4be3b19189d173a9fa544b63b1c5932 | |
parent | c1a71a1ede8f743209237b2736893f3aebe13bb0 (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.c | 8 |
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 | ||
110 | static int __vsyscall(0) vgettimeofday(struct timeval * tv, struct timezone * tz) | 110 | int __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 */ |
123 | static time_t __vsyscall(1) vtime(time_t *t) | 123 | time_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 | ||
132 | static long __vsyscall(2) venosys_0(void) | 132 | long __vsyscall(2) venosys_0(void) |
133 | { | 133 | { |
134 | return -ENOSYS; | 134 | return -ENOSYS; |
135 | } | 135 | } |
136 | 136 | ||
137 | static long __vsyscall(3) venosys_1(void) | 137 | long __vsyscall(3) venosys_1(void) |
138 | { | 138 | { |
139 | return -ENOSYS; | 139 | return -ENOSYS; |
140 | } | 140 | } |