From patchwork Thu Dec 25 17:48:49 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 15611 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 24EC9DDE0F for ; Fri, 26 Dec 2008 04:47:23 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751668AbYLYRrU (ORCPT ); Thu, 25 Dec 2008 12:47:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751815AbYLYRrU (ORCPT ); Thu, 25 Dec 2008 12:47:20 -0500 Received: from pfepa.post.tele.dk ([195.41.46.235]:57835 "EHLO pfepa.post.tele.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751668AbYLYRrT (ORCPT ); Thu, 25 Dec 2008 12:47:19 -0500 Received: from ravnborg.org (x1-6-00-1e-2a-84-ae-3e.k225.webspeed.dk [80.163.61.94]) by pfepa.post.tele.dk (Postfix) with ESMTP id 9EF66A50029; Thu, 25 Dec 2008 18:47:13 +0100 (CET) Received: by ravnborg.org (Postfix, from userid 500) id 8B9F5580D0; Thu, 25 Dec 2008 18:48:49 +0100 (CET) Date: Thu, 25 Dec 2008 18:48:49 +0100 From: Sam Ravnborg To: "David S. Miller" , sparclinux Subject: [PATCH 1/2] sparc: drop SUN_IO Message-ID: <20081225174849.GA8613@uranus.ravnborg.org> Mime-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.4.2.1i Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org SUN_IO is always 'y' so drop it and thus killing an ifdef/endif pair Signed-off-by: Sam Ravnborg --- arch/sparc/Kconfig | 4 ---- arch/sparc/mm/srmmu.c | 2 -- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index cd8c585..8ec81b6 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -469,10 +469,6 @@ config SBUSCHAR bool default y -config SUN_IO - bool - default y - config SUN_LDOMS bool "Sun Logical Domains support" depends on SPARC64 diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index 56df599..fe7ed08 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c @@ -1312,10 +1312,8 @@ void __init srmmu_paging_init(void) #endif poke_srmmu(); -#ifdef CONFIG_SUN_IO srmmu_allocate_ptable_skeleton(sparc_iomap.start, IOBASE_END); srmmu_allocate_ptable_skeleton(DVMA_VADDR, DVMA_END); -#endif srmmu_allocate_ptable_skeleton( __fix_to_virt(__end_of_fixed_addresses - 1), FIXADDR_TOP);