From patchwork Thu Sep 2 02:31:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jin Dongming X-Patchwork-Id: 148021 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 o822UjYN010718 for ; Thu, 2 Sep 2010 02:30:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752187Ab0IBCao (ORCPT ); Wed, 1 Sep 2010 22:30:44 -0400 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:47247 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752718Ab0IBCan (ORCPT ); Wed, 1 Sep 2010 22:30:43 -0400 Received: from m6.gw.fujitsu.co.jp ([10.0.50.76]) by fgwmail6.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id o822UgqN026430 (envelope-from jin.dongming@np.css.fujitsu.com); Thu, 2 Sep 2010 11:30:42 +0900 Received: from smail (m6 [127.0.0.1]) by outgoing.m6.gw.fujitsu.co.jp (Postfix) with ESMTP id 2168E45DE51; Thu, 2 Sep 2010 11:30:42 +0900 (JST) Received: from s6.gw.fujitsu.co.jp (s6.gw.fujitsu.co.jp [10.0.50.96]) by m6.gw.fujitsu.co.jp (Postfix) with ESMTP id 0657545DE4C; Thu, 2 Sep 2010 11:30:42 +0900 (JST) Received: from s6.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s6.gw.fujitsu.co.jp (Postfix) with ESMTP id E02D8E38001; Thu, 2 Sep 2010 11:30:41 +0900 (JST) Received: from m000.s.css.fujitsu.com (m000.s.css.fujitsu.com [10.23.4.38]) by s6.gw.fujitsu.co.jp (Postfix) with ESMTP id 9E26F1DB8013; Thu, 2 Sep 2010 11:30:41 +0900 (JST) Received: from m000.css.fujitsu.com (m000 [127.0.0.1]) by m000.s.css.fujitsu.com (Postfix) with ESMTP id 77F0450EBE0; Thu, 2 Sep 2010 11:30:41 +0900 (JST) Received: from [127.0.0.1] (unknown [10.124.102.46]) by m000.s.css.fujitsu.com (Postfix) with ESMTP id 3AC9050EBDD; Thu, 2 Sep 2010 11:30:41 +0900 (JST) X-SecurityPolicyCheck: OK by SHieldMailChecker v1.5.1 Message-ID: <4C7F0C79.3060506@np.css.fujitsu.com> Date: Thu, 02 Sep 2010 11:31:21 +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: APEI-lenb CC: Huang Ying , Andi Kleen , ACPI , LKLM , Randy Dunlap , Stephen Rothwell , Hidetoshi Seto Subject: [PATCH 1/2] [Patch-next -v2] ACPI, APEI Fix the return value(==NULL) of acpi_pre_map(). 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]); Thu, 02 Sep 2010 02:30:45 +0000 (UTC) diff --git a/drivers/acpi/atomicio.c b/drivers/acpi/atomicio.c index 8f8bd73..1bc2614 100644 --- a/drivers/acpi/atomicio.c +++ b/drivers/acpi/atomicio.c @@ -133,7 +133,7 @@ static void __iomem *acpi_pre_map(phys_addr_t paddr, spin_lock_irqsave(&acpi_iomaps_lock, flags); vaddr = __acpi_try_ioremap(paddr, size); - if (vaddr) { + if (unlikely(vaddr)) { spin_unlock_irqrestore(&acpi_iomaps_lock, flags); iounmap(map->vaddr); kfree(map); @@ -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 - pg_off); err_unmap: iounmap(vaddr); return NULL;