From patchwork Wed May 12 15:32:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Egger X-Patchwork-Id: 52390 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-ww0-f56.google.com (mail-ww0-f56.google.com [74.125.82.56]) by ozlabs.org (Postfix) with ESMTP id D9C37B7D1B for ; Thu, 13 May 2010 01:32:36 +1000 (EST) Received: by wwi17 with SMTP id 17sf51279wwi.11 for ; Wed, 12 May 2010 08:32:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=domainkey-signature:received:x-beenthere:received:received:received :received:received-spf:received:received:date:from:to:cc:subject :message-id:mime-version:user-agent :x-original-authentication-results:x-original-sender:reply-to :precedence:mailing-list:list-id:list-post:list-help:list-archive :sender:list-subscribe:list-unsubscribe:content-type :content-disposition; bh=FrbaP1xRrimX8Ow/o5LSHkO5VEszbnrcGoc2Q1bumS0=; b=vgo6onpzcZ16lm8C2FxjDQcQBvjgy2n2+YP2YB22esS9URbRYnuaW5amuPpEYgIkGG gUa6pIy0kDkOK+Wd2EcI6x/QJB02EHVfMAvFxycdrn4rwL6Aex+oPqCBXTcAgPlB7NBx 5Iy+8MzJWQGK4wMqYeX+Fl6UHF9OYZoNg2axg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlegroups.com; s=beta; h=x-beenthere:received-spf:date:from:to:cc:subject:message-id :mime-version:user-agent:x-original-authentication-results :x-original-sender:reply-to:precedence:mailing-list:list-id :list-post:list-help:list-archive:sender:list-subscribe :list-unsubscribe:content-type:content-disposition; b=DWB9d438k89n9tmH+erax4tG663g3oPGNik8NCzJhwkJhVenL6f05YGhozJBSBaqXP 54Z3IHf/NoplZ8ot4HM6EBzxPT8Kb88mjbAp/eFPneMY9Gojy2qgGc6FFT1f35830mQ3 N7I8G0F+3jJtcALGmNMB6QLDIPWO6Gz3fDig4= Received: by 10.223.13.196 with SMTP id d4mr860553faa.48.1273678353875; Wed, 12 May 2010 08:32:33 -0700 (PDT) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.87.8.39 with SMTP id l39ls7058795fgi.2.p; Wed, 12 May 2010 08:32:33 -0700 (PDT) Received: by 10.87.1.9 with SMTP id d9mr507765fgi.23.1273678351069; Wed, 12 May 2010 08:32:31 -0700 (PDT) Received: by 10.87.1.9 with SMTP id d9mr507764fgi.23.1273678351045; Wed, 12 May 2010 08:32:31 -0700 (PDT) Received: from faui40.informatik.uni-erlangen.de (faui40.informatik.uni-erlangen.de [131.188.34.40]) by gmr-mx.google.com with ESMTP id x13si226387fah.7.2010.05.12.08.32.31; Wed, 12 May 2010 08:32:31 -0700 (PDT) Received-SPF: neutral (google.com: 131.188.34.40 is neither permitted nor denied by best guess record for domain of siccegge@cs.fau.de) client-ip=131.188.34.40; Received: from faui49h (faui49h.informatik.uni-erlangen.de [131.188.42.58]) by faui40.informatik.uni-erlangen.de (Postfix) with SMTP id 864AA5F0C8; Wed, 12 May 2010 17:32:29 +0200 (MEST) Received: by faui49h (sSMTP sendmail emulation); Wed, 12 May 2010 17:32:29 +0200 Date: Wed, 12 May 2010 17:32:29 +0200 From: Christoph Egger To: Alessandro Zummo , Paul Gortmaker , Andrew Morton , maltesch@gmx.de, Ralf Baechle , Herton Ronaldo Krzesinski , rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org Cc: vamos@i4.informatik.uni-erlangen.de Subject: [rtc-linux] [PATCH] Un(de)selectable block for DISCONTIGMEM/64BIT on parisc Message-ID: <20100512153229.GA3379@faui49.informatik.uni-erlangen.de> MIME-Version: 1.0 User-Agent: Mutt/1.5.20 (2009-06-14) X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 131.188.34.40 is neither permitted nor denied by best guess record for domain of siccegge@cs.fau.de) smtp.mail=siccegge@cs.fau.de X-Original-Sender: siccegge@cs.fau.de Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , Content-Disposition: inline Hi all! As part of the VAMOS[0] research project at the University of Erlangen we are looking at multiple integrity errors in linux' configuration system. When considering the restrictions inposed in kconfig 64BIT will *always* be set when DISCONTIGMEM is present on parisc so the code path depending on !64BIT is actually unreachable and the whole check unnecessary. Please keep me informed of this patch getting confirmed / merged so we can keep track of it. Regards Christoph Egger [0] http://vamos1.informatik.uni-erlangen.de/ ---- From 5eeae9c56e2602a68b62b21691e6756fb5198dd7 Mon Sep 17 00:00:00 2001 From: Christoph Egger Date: Wed, 12 May 2010 16:59:24 +0200 Subject: [PATCH] on parisc CONFIG_DISCONTIGMEM always depends on CONFIG_64BIT Removing a conditional on 64BIT inside a DISCONTIGMEM block inside arch/parisc. DISCONTIGMEM depends on ARCH_DISCONTIGMEM_ENABLE either directly or through DISCONTIGMEM_MANUAL which in turn depends on 64BIT inside Kconfig so the check and the else case isn't needed at all (the else case can't ever be reached) Signed-off-by: Christoph Egger --- arch/parisc/include/asm/mmzone.h | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/arch/parisc/include/asm/mmzone.h b/arch/parisc/include/asm/mmzone.h index 9608d2c..dbddcac 100644 --- a/arch/parisc/include/asm/mmzone.h +++ b/arch/parisc/include/asm/mmzone.h @@ -35,12 +35,7 @@ extern struct node_map_data node_data[]; #define PFNNID_MAP_MAX 512 /* support 512GB */ extern unsigned char pfnnid_map[PFNNID_MAP_MAX]; -#ifndef CONFIG_64BIT #define pfn_is_io(pfn) ((pfn & (0xf0000000UL >> PAGE_SHIFT)) == (0xf0000000UL >> PAGE_SHIFT)) -#else -/* io can be 0xf0f0f0f0f0xxxxxx or 0xfffffffff0000000 */ -#define pfn_is_io(pfn) ((pfn & (0xf000000000000000UL >> PAGE_SHIFT)) == (0xf000000000000000UL >> PAGE_SHIFT)) -#endif static inline int pfn_to_nid(unsigned long pfn) {