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 3204467A3F for ; Wed, 28 Jun 2006 11:52:05 +1000 (EST) Date: Wed, 28 Jun 2006 11:51:41 +1000 From: Stephen Rothwell To: paulus@samba.org Subject: [PATCH] update asm-powerpc/time.h Message-Id: <20060628115141.47db50ae.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: , If we ever build a combined kernel including iSeries, then this will be needed. Signed-off-by: Stephen Rothwell --- include/asm-powerpc/time.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ diff --git a/include/asm-powerpc/time.h b/include/asm-powerpc/time.h index 912118d..db8a57e 100644 --- a/include/asm-powerpc/time.h +++ b/include/asm-powerpc/time.h @@ -19,8 +19,9 @@ #include #include #include -#ifdef CONFIG_PPC64 +#ifdef CONFIG_PPC_ISERIES #include +#include #include #endif @@ -178,7 +179,8 @@ #else #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) -- 1.3.3.g16a4