[POWERPC] iSeries: fix time.c for combined build
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
ad5cb17f73
commit
501b6d2938
|
@ -631,7 +631,8 @@ void timer_interrupt(struct pt_regs * regs)
|
|||
calculate_steal_time();
|
||||
|
||||
#ifdef CONFIG_PPC_ISERIES
|
||||
get_lppaca()->int_dword.fields.decr_int = 0;
|
||||
if (firmware_has_feature(FW_FEATURE_ISERIES))
|
||||
get_lppaca()->int_dword.fields.decr_int = 0;
|
||||
#endif
|
||||
|
||||
while ((ticks = tb_ticks_since(per_cpu(last_jiffy, cpu)))
|
||||
|
@ -674,7 +675,7 @@ void timer_interrupt(struct pt_regs * regs)
|
|||
set_dec(next_dec);
|
||||
|
||||
#ifdef CONFIG_PPC_ISERIES
|
||||
if (hvlpevent_is_pending())
|
||||
if (firmware_has_feature(FW_FEATURE_ISERIES) && hvlpevent_is_pending())
|
||||
process_hvlpevents();
|
||||
#endif
|
||||
|
||||
|
@ -774,7 +775,7 @@ int do_settimeofday(struct timespec *tv)
|
|||
* settimeofday to perform this operation.
|
||||
*/
|
||||
#ifdef CONFIG_PPC_ISERIES
|
||||
if (first_settimeofday) {
|
||||
if (firmware_has_feature(FW_FEATURE_ISERIES) && first_settimeofday) {
|
||||
iSeries_tb_recal();
|
||||
first_settimeofday = 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue