From patchwork Sun Sep 26 03:27:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan Wu X-Patchwork-Id: 65770 X-Patchwork-Delegate: tim.gardner@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 02E30B70F3 for ; Sun, 26 Sep 2010 13:28:41 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Ozhum-0001Mo-Bd; Sun, 26 Sep 2010 04:28:36 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Ozhuk-0001MX-Hx for kernel-team@lists.ubuntu.com; Sun, 26 Sep 2010 04:28:34 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1Ozhuk-0006z8-Ew; Sun, 26 Sep 2010 04:28:34 +0100 Received: from [58.41.15.248] (helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1Ozhui-0004ed-M8; Sun, 26 Sep 2010 04:28:34 +0100 From: Bryan Wu To: tim.gardner@canonical.com, leann.ogasawara@canonical.com, kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: SAUCE: Fix a buidling error when turn off CONFIG_SMP Date: Sun, 26 Sep 2010 11:27:58 +0800 Message-Id: <1285471678-5983-2-git-send-email-bryan.wu@canonical.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1285471678-5983-1-git-send-email-bryan.wu@canonical.com> References: <1285471678-5983-1-git-send-email-bryan.wu@canonical.com> Cc: molnar@ti.com, ogra@canonical.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/647890 Commit bde95e1bcf0b39b06c365e509dc4e11bfcbb54e5 introduced a building error: --- /opt/git/Ubuntu/roc/ubuntu-maverick/arch/arm/mm/ioremap.c: In function '__arm_multi_strided_ioremap': /opt/git/Ubuntu/roc/ubuntu-maverick/arch/arm/mm/ioremap.c:437: error: 'size' undeclared (first use in this function) /opt/git/Ubuntu/roc/ubuntu-maverick/arch/arm/mm/ioremap.c:437: error: (Each undeclared identifier is reported only once /opt/git/Ubuntu/roc/ubuntu-maverick/arch/arm/mm/ioremap.c:437: error: for each function it appears in.) make[3]: *** [arch/arm/mm/ioremap.o] Error 1 make[2]: *** [arch/arm/mm] Error 2 make[2]: *** Waiting for unfinished jobs.... -- This patch fixed this. Cc: Lajos Molnar Signed-off-by: Bryan Wu --- arch/arm/mm/ioremap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index a6cdb4e..e66004b 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c @@ -434,7 +434,7 @@ __arm_multi_strided_ioremap(int sections, ~SUPERSECTION_MASK)) { area->flags |= VM_ARM_SECTION_MAPPING; err = remap_area_supersections(addr_i, pfns[i], - size[i], type); + phys_size[i], type); } else if (!((__pfn_to_phys(pfns[i]) | vstride | addr_i) & ~PMD_MASK)) { area->flags |= VM_ARM_SECTION_MAPPING;