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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
asm-powerpc
/
time.h
diff --git
a/include/asm-powerpc/time.h
b/include/asm-powerpc/time.h
index
912118d
..
5785ac4
100644
(file)
--- a/
include/asm-powerpc/time.h
+++ b/
include/asm-powerpc/time.h
@@
-14,13
+14,13
@@
#define __POWERPC_TIME_H
#ifdef __KERNEL__
#define __POWERPC_TIME_H
#ifdef __KERNEL__
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/percpu.h>
#include <asm/processor.h>
#include <linux/types.h>
#include <linux/percpu.h>
#include <asm/processor.h>
-#ifdef CONFIG_PPC
64
+#ifdef CONFIG_PPC
_ISERIES
#include <asm/paca.h>
#include <asm/paca.h>
+#include <asm/firmware.h>
#include <asm/iseries/hv_call.h>
#endif
#include <asm/iseries/hv_call.h>
#endif
@@
-30,10
+30,6
@@
extern unsigned long tb_ticks_per_usec;
extern unsigned long tb_ticks_per_sec;
extern u64 tb_to_xs;
extern unsigned tb_to_us;
extern unsigned long tb_ticks_per_sec;
extern u64 tb_to_xs;
extern unsigned tb_to_us;
-extern unsigned long tb_last_stamp;
-extern u64 tb_last_jiffy;
-
-DECLARE_PER_CPU(unsigned long, last_jiffy);
struct rtc_time;
extern void to_tm(int tim, struct rtc_time * tm);
struct rtc_time;
extern void to_tm(int tim, struct rtc_time * tm);
@@
-178,7
+174,8
@@
static inline void set_dec(int val)
#ifdef CONFIG_PPC_ISERIES
int cur_dec;
#ifdef CONFIG_PPC_ISERIES
int cur_dec;
- if (get_lppaca()->shared_proc) {
+ if (firmware_has_feature(FW_FEATURE_ISERIES) &&
+ get_lppaca()->shared_proc) {
get_lppaca()->virtual_decr = val;
cur_dec = get_dec();
if (cur_dec > val)
get_lppaca()->virtual_decr = val;
cur_dec = get_dec();
if (cur_dec > val)