summaryrefslogtreecommitdiff
path: root/include/asm-mips/processor.h
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2004-06-26 21:53:53 +0100
committerAnton Altaparmakov <aia21@cantab.net>2004-06-26 21:53:53 +0100
commit320ed1994ecf7ccadaaa95196467565b34d8d686 (patch)
treeb36f16a87596469091c97d35002faa1b5c0360ab /include/asm-mips/processor.h
parent702fdfcae9a47ec4976d82d3d0b4b4a41bd72a52 (diff)
parentf6a7507c1714f5cb4faaebc76a1d02260830be01 (diff)
Merge cantab.net:/home/src/bklinux-2.6
into cantab.net:/home/src/ntfs-2.6
Diffstat (limited to 'include/asm-mips/processor.h')
-rw-r--r--include/asm-mips/processor.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/include/asm-mips/processor.h b/include/asm-mips/processor.h
index 70534af2a59c..8e38389a9915 100644
--- a/include/asm-mips/processor.h
+++ b/include/asm-mips/processor.h
@@ -280,15 +280,6 @@ unsigned long get_wchan(struct task_struct *p);
*/
#define return_address() ({__asm__ __volatile__("":::"$31");__builtin_return_address(0);})
-/*
- * For now. The 32-bit cycle counter is screwed up so solving this nicely takes a little
- * brainwork ...
- */
-static inline unsigned long long sched_clock(void)
-{
- return 0ULL;
-}
-
#ifdef CONFIG_CPU_HAS_PREFETCH
#define ARCH_HAS_PREFETCH