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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-ppc
/
time.h
diff --git
a/include/asm-ppc/time.h
b/include/asm-ppc/time.h
index
73f4fcd
..
f7eadf6
100644
(file)
--- a/
include/asm-ppc/time.h
+++ b/
include/asm-ppc/time.h
@@
-9,8
+9,8
@@
#ifndef __ASM_TIME_H__
#define __ASM_TIME_H__
#ifndef __ASM_TIME_H__
#define __ASM_TIME_H__
-#include <linux/
config
.h>
-#include <linux/
mc146818
rtc.h>
+#include <linux/
types
.h>
+#include <linux/rtc.h>
#include <linux/threads.h>
#include <asm/reg.h>
#include <linux/threads.h>
#include <asm/reg.h>
@@
-57,7
+57,7
@@
static __inline__ void set_dec(unsigned int val)
/* Accessor functions for the timebase (RTC on 601) registers. */
/* If one day CONFIG_POWER is added just define __USE_RTC as 1 */
#ifdef CONFIG_6xx
/* Accessor functions for the timebase (RTC on 601) registers. */
/* If one day CONFIG_POWER is added just define __USE_RTC as 1 */
#ifdef CONFIG_6xx
-extern __inline__ int
const
__USE_RTC(void) {
+extern __inline__ int
__attribute_pure__
__USE_RTC(void) {
return (mfspr(SPRN_PVR)>>16) == 1;
}
#else
return (mfspr(SPRN_PVR)>>16) == 1;
}
#else
@@
-152,5
+152,10
@@
extern __inline__ unsigned binary_tbl(void) {
({unsigned z; asm ("mulhwu %0,%1,%2" : "=r" (z) : "r" (x), "r" (y)); z;})
unsigned mulhwu_scale_factor(unsigned, unsigned);
({unsigned z; asm ("mulhwu %0,%1,%2" : "=r" (z) : "r" (x), "r" (y)); z;})
unsigned mulhwu_scale_factor(unsigned, unsigned);
+
+#define account_process_vtime(tsk) do { } while (0)
+#define calculate_steal_time() do { } while (0)
+#define snapshot_timebases() do { } while (0)
+
#endif /* __ASM_TIME_H__ */
#endif /* __KERNEL__ */
#endif /* __ASM_TIME_H__ */
#endif /* __KERNEL__ */