From patchwork Tue Mar 12 20:35:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Bolle X-Patchwork-Id: 227113 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DCA7B2C0297 for ; Wed, 13 Mar 2013 07:40:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932732Ab3CLUk3 (ORCPT ); Tue, 12 Mar 2013 16:40:29 -0400 Received: from cpsmtpb-ews03.kpnxchange.com ([213.75.39.6]:53337 "EHLO cpsmtpb-ews03.kpnxchange.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932514Ab3CLUk3 (ORCPT ); Tue, 12 Mar 2013 16:40:29 -0400 X-Greylist: delayed 308 seconds by postgrey-1.27 at vger.kernel.org; Tue, 12 Mar 2013 16:40:29 EDT Received: from cpsps-ews21.kpnxchange.com ([10.94.84.187]) by cpsmtpb-ews03.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Tue, 12 Mar 2013 21:33:51 +0100 Received: from CPSMTPM-TLF102.kpnxchange.com ([195.121.3.5]) by cpsps-ews21.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Tue, 12 Mar 2013 21:33:51 +0100 Received: from [192.168.1.101] ([212.123.139.93]) by CPSMTPM-TLF102.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Tue, 12 Mar 2013 21:35:19 +0100 Message-ID: <1363120519.3137.148.camel@x61.thuisdomein> Subject: [PATCH] sparc: delete "if !ULTRA_HAS_POPULATION_COUNT" From: Paul Bolle To: "David S. Miller" Cc: sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org Date: Tue, 12 Mar 2013 21:35:19 +0100 X-Mailer: Evolution 3.4.4 (3.4.4-2.fc17) Mime-Version: 1.0 X-OriginalArrivalTime: 12 Mar 2013 20:35:19.0851 (UTC) FILETIME=[1CF637B0:01CE1F61] X-RcptDomain: vger.kernel.org Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org Commit 2d78d4beb64eb07d50665432867971c481192ebf ("[PATCH] bitops: sparc64: use generic bitops") made the default of GENERIC_HWEIGHT depend on !ULTRA_HAS_POPULATION_COUNT. But since there's no Kconfig symbol with that name, this always evaluates to true. Delete this dependency. Signed-off-by: Paul Bolle Acked-by: Sam Ravnborg --- 0) Tested with "make ARCH=sparc menuconfig" (before and after this patch). 1) There apparently is an (obscure) preprocessor macro ULTRA_HAS_POPULATION_COUNT. But the check for it got removed in commit ef7c4d4675d2a9206f913f26ca1a5cd41bff9d41 ("sparc: Use popc if possible for hweight routines."). arch/sparc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 289127d..7fcd4b4 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -197,7 +197,7 @@ config RWSEM_XCHGADD_ALGORITHM config GENERIC_HWEIGHT bool - default y if !ULTRA_HAS_POPULATION_COUNT + default y config GENERIC_CALIBRATE_DELAY bool