From patchwork Mon Sep 6 01:10:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jin Dongming X-Patchwork-Id: 157281 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o861AQMu027320 for ; Mon, 6 Sep 2010 01:10:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754589Ab0IFBKZ (ORCPT ); Sun, 5 Sep 2010 21:10:25 -0400 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:36270 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750921Ab0IFBKY (ORCPT ); Sun, 5 Sep 2010 21:10:24 -0400 Received: from m4.gw.fujitsu.co.jp ([10.0.50.74]) by fgwmail6.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id o861AKgd026190 (envelope-from jin.dongming@np.css.fujitsu.com); Mon, 6 Sep 2010 10:10:20 +0900 Received: from smail (m4 [127.0.0.1]) by outgoing.m4.gw.fujitsu.co.jp (Postfix) with ESMTP id 4787745DE6F; Mon, 6 Sep 2010 10:10:20 +0900 (JST) Received: from s4.gw.fujitsu.co.jp (s4.gw.fujitsu.co.jp [10.0.50.94]) by m4.gw.fujitsu.co.jp (Postfix) with ESMTP id 244CA45DE60; Mon, 6 Sep 2010 10:10:20 +0900 (JST) Received: from s4.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s4.gw.fujitsu.co.jp (Postfix) with ESMTP id 03CC31DB803B; Mon, 6 Sep 2010 10:10:20 +0900 (JST) Received: from m005.s.css.fujitsu.com (m005.s.css.fujitsu.com [10.23.4.35]) by s4.gw.fujitsu.co.jp (Postfix) with ESMTP id A91FC1DB803F; Mon, 6 Sep 2010 10:10:19 +0900 (JST) Received: from m005.css.fujitsu.com (m005 [127.0.0.1]) by m005.s.css.fujitsu.com (Postfix) with ESMTP id 84D592DFE6D; Mon, 6 Sep 2010 10:10:19 +0900 (JST) Received: from [127.0.0.1] (unknown [10.124.102.46]) by m005.s.css.fujitsu.com (Postfix) with ESMTP id 478632DFE4A; Mon, 6 Sep 2010 10:10:19 +0900 (JST) X-SecurityPolicyCheck: OK by SHieldMailChecker v1.5.1 Message-ID: <4C843F97.70608@np.css.fujitsu.com> Date: Mon, 06 Sep 2010 10:10:47 +0900 From: Jin Dongming User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; ja; rv:1.9.2.7) Gecko/20100713 Thunderbird/3.1.1 MIME-Version: 1.0 To: Bjorn Helgaas , APEI-lenb CC: Huang Ying , Andi Kleen , Randy Dunlap , Stephen Rothwell , Hidetoshi Seto , ACPI , LKLM Subject: [Patch-next] ACPI, APEI: fix acpi_pre_map() return value. Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 06 Sep 2010 01:10:26 +0000 (UTC) diff --git a/drivers/acpi/atomicio.c b/drivers/acpi/atomicio.c index 8f8bd73..542e539 100644 --- a/drivers/acpi/atomicio.c +++ b/drivers/acpi/atomicio.c @@ -142,7 +142,7 @@ static void __iomem *acpi_pre_map(phys_addr_t paddr, list_add_tail_rcu(&map->list, &acpi_iomaps); spin_unlock_irqrestore(&acpi_iomaps_lock, flags); - return vaddr + (paddr - pg_off); + return map->vaddr + (paddr - map->paddr); err_unmap: iounmap(vaddr); return NULL;