projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
powerpc: Remove FW_FEATURE ISERIES from arch code
[cascardo/linux.git]
/
arch
/
powerpc
/
include
/
asm
/
time.h
diff --git
a/arch/powerpc/include/asm/time.h
b/arch/powerpc/include/asm/time.h
index
7eb10fb
..
2136f58
100644
(file)
--- a/
arch/powerpc/include/asm/time.h
+++ b/
arch/powerpc/include/asm/time.h
@@
-18,11
+18,6
@@
#include <linux/percpu.h>
#include <asm/processor.h>
#include <linux/percpu.h>
#include <asm/processor.h>
-#ifdef CONFIG_PPC_ISERIES
-#include <asm/paca.h>
-#include <asm/firmware.h>
-#include <asm/iseries/hv_call.h>
-#endif
/* time.c */
extern unsigned long tb_ticks_per_jiffy;
/* time.c */
extern unsigned long tb_ticks_per_jiffy;
@@
-166,15
+161,6
@@
static inline void set_dec(int val)
#else
#ifndef CONFIG_BOOKE
--val;
#else
#ifndef CONFIG_BOOKE
--val;
-#endif
-#ifdef CONFIG_PPC_ISERIES
- if (firmware_has_feature(FW_FEATURE_ISERIES) &&
- get_lppaca()->shared_proc) {
- get_lppaca()->virtual_decr = val;
- if (get_dec() > val)
- HvCall_setVirtualDecr();
- return;
- }
#endif
mtspr(SPRN_DEC, val);
#endif /* not 40x or 8xx_CPU6 */
#endif
mtspr(SPRN_DEC, val);
#endif /* not 40x or 8xx_CPU6 */
@@
-217,7
+203,6
@@
DECLARE_PER_CPU(struct cpu_usage, cpu_usage_array);
#endif
extern void secondary_cpu_time_init(void);
#endif
extern void secondary_cpu_time_init(void);
-extern void iSeries_time_init_early(void);
DECLARE_PER_CPU(u64, decrementers_next_tb);
DECLARE_PER_CPU(u64, decrementers_next_tb);