aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2007-07-19 04:49:23 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 13:04:52 -0400
commitd7e28ffe6c74416b54345d6004fd0964c115b12c (patch)
tree844beb4f400d5400098538e0c1e5f12d20a9504a /arch
parent07ad157f6e5d228be78acd5cea0291e5d0360398 (diff)
lguest: the host code
This is the code for the "lg.ko" module, which allows lguest guests to be launched. [akpm@linux-foundation.org: update for futex-new-private-futexes] [akpm@linux-foundation.org: build fix] [jmorris@namei.org: lguest: use hrtimers] [akpm@linux-foundation.org: x86_64 build fix] Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Cc: Andi Kleen <ak@suse.de> Cc: Eric Dumazet <dada1@cosmosbay.com> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/tsc.c4
-rw-r--r--arch/x86_64/kernel/tsc.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/i386/kernel/tsc.c b/arch/i386/kernel/tsc.c
index 252f9010f283..debd7dbb4158 100644
--- a/arch/i386/kernel/tsc.c
+++ b/arch/i386/kernel/tsc.c
@@ -27,6 +27,7 @@ static int tsc_enabled;
27 * an extra value to store the TSC freq 27 * an extra value to store the TSC freq
28 */ 28 */
29unsigned int tsc_khz; 29unsigned int tsc_khz;
30EXPORT_SYMBOL_GPL(tsc_khz);
30 31
31int tsc_disable; 32int tsc_disable;
32 33
@@ -58,10 +59,11 @@ __setup("notsc", tsc_setup);
58 */ 59 */
59static int tsc_unstable; 60static int tsc_unstable;
60 61
61static inline int check_tsc_unstable(void) 62int check_tsc_unstable(void)
62{ 63{
63 return tsc_unstable; 64 return tsc_unstable;
64} 65}
66EXPORT_SYMBOL_GPL(check_tsc_unstable);
65 67
66/* Accellerators for sched_clock() 68/* Accellerators for sched_clock()
67 * convert from cycles(64bits) => nanoseconds (64bits) 69 * convert from cycles(64bits) => nanoseconds (64bits)
diff --git a/arch/x86_64/kernel/tsc.c b/arch/x86_64/kernel/tsc.c
index 48f9a8e6aa91..e850aa01e1b3 100644
--- a/arch/x86_64/kernel/tsc.c
+++ b/arch/x86_64/kernel/tsc.c
@@ -44,7 +44,7 @@ unsigned long long sched_clock(void)
44 44
45static int tsc_unstable; 45static int tsc_unstable;
46 46
47static inline int check_tsc_unstable(void) 47inline int check_tsc_unstable(void)
48{ 48{
49 return tsc_unstable; 49 return tsc_unstable;
50} 50}