From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtps.tip.net.au (chilli.pcug.org.au [203.10.76.44]) by ozlabs.org (Postfix) with ESMTP id 2495767D08 for ; Mon, 13 Nov 2006 14:47:38 +1100 (EST) Date: Mon, 13 Nov 2006 14:47:36 +1100 From: Stephen Rothwell To: paulus@samba.org Subject: [POWERPC] iSeries: fix time.c for combined build Message-Id: <20061113144736.beb61f98.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Cc: ppc-dev List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Signed-off-by: Stephen Rothwell --- arch/powerpc/kernel/time.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index a1b5e4b..ab35854 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -630,9 +630,8 @@ void timer_interrupt(struct pt_regs * re profile_tick(CPU_PROFILING); calculate_steal_time(); -#ifdef CONFIG_PPC_ISERIES - get_lppaca()->int_dword.fields.decr_int = 0; -#endif + if (firmware_has_feature(FW_FEATURE_ISERIES)) + get_lppaca()->int_dword.fields.decr_int = 0; while ((ticks = tb_ticks_since(per_cpu(last_jiffy, cpu))) >= tb_ticks_per_jiffy) { @@ -674,7 +673,7 @@ void timer_interrupt(struct pt_regs * re 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 +773,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; } -- 1.4.3.3