From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753639Ab1LUQ2R (ORCPT ); Wed, 21 Dec 2011 11:28:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:63224 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753562Ab1LUQ2D (ORCPT ); Wed, 21 Dec 2011 11:28:03 -0500 Date: Wed, 21 Dec 2011 18:30:02 +0200 From: "Michael S. Tsirkin" To: linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCHv2 RFC (repost) 11/16] tile: don't panic on iomap Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Mutt-Fcc: =sent User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I think panic on iomap is there just for debugging. If we return NULL instead, the generic pci_iomap will DTRT so we don't need to roll our own. Signed-off-by: Michael S. Tsirkin Acked-by: Chris Metcalf --- arch/tile/include/asm/io.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/tile/include/asm/io.h b/arch/tile/include/asm/io.h index c9ea165..d2152de 100644 --- a/arch/tile/include/asm/io.h +++ b/arch/tile/include/asm/io.h @@ -204,7 +204,8 @@ static inline long ioport_panic(void) static inline void __iomem *ioport_map(unsigned long port, unsigned int len) { - return (void __iomem *) ioport_panic(); + pr_info("ioport_map: mapping IO resources is unsupported on tile.\n"); + return NULL; } static inline void ioport_unmap(void __iomem *addr) -- 1.7.8.382.g3daff