From patchwork Thu Jan 21 10:49:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101146 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp3699623lbb; Thu, 21 Jan 2016 02:49:57 -0800 (PST) X-Received: by 10.66.118.198 with SMTP id ko6mr60007390pab.122.1453373397567; Thu, 21 Jan 2016 02:49:57 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t72si1334880pfi.38.2016.01.21.02.49.57; Thu, 21 Jan 2016 02:49:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965165AbcAUKtz (ORCPT + 29 others); Thu, 21 Jan 2016 05:49:55 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:51076 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965129AbcAUKtx (ORCPT ); Thu, 21 Jan 2016 05:49:53 -0500 Received: from wuerfel.localnet ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPSA (Nemesis) id 0ML7xp-1aMTn620w5-000I1m; Thu, 21 Jan 2016 11:49:45 +0100 From: Arnd Bergmann To: Johannes Weiner Cc: Andrew Morton , Shaohua Li , Siddhesh Poyarekar , linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: [PATCH] proc: add missing 'mm' variable in nommu is_stack() Date: Thu, 21 Jan 2016 11:49:42 +0100 Message-ID: <2208534.bqAiu8Kgku@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1453226559-17322-1-git-send-email-hannes@cmpxchg.org> References: <1453226559-17322-1-git-send-email-hannes@cmpxchg.org> MIME-Version: 1.0 X-Provags-ID: V03:K0:Ldv3mjQgUWuvCVFFAVE7qtU08uPisoYWulBnWkI+VmvbAar3469 uCimDADrDfu2RlSSsxTfIJ79K+yBiB9ZypjLvtXcJdaghSNqSaB56N6RGM5JkJlWnjZ7EZU +ly6Skz0KTdZK1CtcXw61eFcomUnJt4Yj/c7z0EIlOAU7PFresJLRXMAS4n6CnIkK97Mkv4 brMoIGHImxyf1rK6C5wGA== X-UI-Out-Filterresults: notjunk:1; V01:K0:zCLFpuPoS3M=:GMXkux8dDPC19iESsMIiD0 Njo1l8pP5/FNFyrJzcPskOhjVM0G5aTFduAl3VamkzN6t7AoqzXahHVOCE3FC0y6ksTgb8kWc TSJw2YRxUKwwwQ9sAc7OsCYAC1GLlfU7QwcB7TZ1rKt3j7vHAZDZaS/V3F9r7eAXLgDzgKPZD dFnRbR60iMhbC0B8UT9Pc1khWcbRizEguakavOEwvKjWGupf9MnLFSWPyC0L3bPDuXdnEYtnD F8XTJIc0veAIn2xG/dRtFgCK4IsGlDgnYz6GLe18DeJ760Ekp3zJ/ooBCLdUQZ0vKjaHXZsin Sw2xF6ja4egBVlBjqslv+ZEcXTfnIhsinkc0VhZztpKgBB7Q70KVDRoAoFn0IDZDclRAE1Mlj eQoyw5rJABkQp16q1hTGHku5nMSOboFghNglQC8bV4fuLwePZaMhOGUNxzixD/ogOfYm8pdqn lsA0xJZoSKkuVDomoqNTV/jZ6/WR2eYQjPbDhMFMNDLUUms+U2Q5U6++bDR0BLsafPvVhRsW+ mAeR1LGAbjgo8M7F1Zf02KmPJf7FFDPJ94fsnp0a0/fQwjXy2lDvjDVSDd3eTRr8sPqiGhgjN jxpvboq3chhmatDr6+XPS21uDrVeptY6dG7tnWW7uSH9xdTxDnhWL9T9yQ0c702L2NIOeDn/t 9luxB5HxDj6ICgP55sCX2gHNw2O9PNoASAasu/LrnZnQFrC2Fhwl+stuuBfqjhHymvuffacI0 TGEdneAMzT4nqWEe Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A recent revert left an incomplete function in fs/proc/task_nommu.c, causing a build error for any NOMMU configuration with procfs: fs/proc/task_nommu.c:132:28: error: 'mm' undeclared (first use in this function) stack = vma->vm_start <= mm->start_stack && Evidently, there is just a missing variable that is available in the calling function but not inside of is_stack(). This adds it. Signed-off-by: Arnd Bergmann Fixes: e87d4fd02f40 ("proc: revert /proc//maps [stack:TID] annotation") --- This came up today on my ARM randconfig builds with linux-next. I did not run the kernel to see if the code actually works, but it seems straightforward enough. diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c index 60ab72e38f78..faacb0c0d857 100644 --- a/fs/proc/task_nommu.c +++ b/fs/proc/task_nommu.c @@ -126,6 +126,7 @@ unsigned long task_statm(struct mm_struct *mm, static int is_stack(struct proc_maps_private *priv, struct vm_area_struct *vma, int is_pid) { + struct mm_struct *mm = vma->vm_mm; int stack = 0; if (is_pid) {