git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
include
/
asm-i386
/
timex.h
diff --git
a/include/asm-i386/timex.h
b/include/asm-i386/timex.h
index
e737729
..
6d5d757
100644
(file)
--- a/
include/asm-i386/timex.h
+++ b/
include/asm-i386/timex.h
@@
-7,7
+7,7
@@
#define _ASMi386_TIMEX_H
#include <linux/config.h>
#define _ASMi386_TIMEX_H
#include <linux/config.h>
-#include <asm/
ms
r.h>
+#include <asm/
processo
r.h>
#ifdef CONFIG_X86_ELAN
# define CLOCK_TICK_RATE 1189200 /* AMD Elan has different frequency! */
#ifdef CONFIG_X86_ELAN
# define CLOCK_TICK_RATE 1189200 /* AMD Elan has different frequency! */
@@
-40,14
+40,17
@@
extern cycles_t cacheflush_time;
static inline cycles_t get_cycles (void)
{
static inline cycles_t get_cycles (void)
{
+ unsigned long long ret=0;
+
#ifndef CONFIG_X86_TSC
#ifndef CONFIG_X86_TSC
- return 0;
-#else
- unsigned long long ret;
+ if (!cpu_has_tsc)
+ return 0;
+#endif
+#if defined(CONFIG_X86_GENERIC) || defined(CONFIG_X86_TSC)
rdtscll(ret);
rdtscll(ret);
- return ret;
#endif
#endif
+ return ret;
}
extern unsigned long cpu_khz;
}
extern unsigned long cpu_khz;