Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp4577300ybb; Tue, 14 Apr 2020 09:58:11 -0700 (PDT) X-Google-Smtp-Source: APiQypKFx54e9fRWZfBc0VOx+qnqlNkcQIFigBL0Ij6kubc5rCQT6W6gI3K5kB92PoCiqR4MTekG X-Received: by 2002:a17:907:6fc:: with SMTP id yh28mr1095282ejb.326.1586883491767; Tue, 14 Apr 2020 09:58:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586883491; cv=none; d=google.com; s=arc-20160816; b=dG93d/h0xYgCZt2AL4taZlOVfZS9+8qxSsWEOHEil573Ufiu8S9y6Gnglu/KXDbQEZ qh5xWUYUEPplAsj6qNE0PxttBA5udMAcqL5tjQ0qZuPJ8jSqvlhC7SWGJzZt1s2buw9U T3slkiWnqRdxY/0j6WFbqigm0uSyU8WwvGEvzYO4QmNuD6JbmRyd7CHmzFmhYci63t0w l/z0xoo1pkHS93JvYm3zHtGhevppQZ4iTsK9G8XsFTn13RM6N+CdJDCMZrqW9BTx5lnl TGbOJFWqdA8ecm81AQ6w2yQ1R4UNlioM0GNjZCVWI6Atocn1T3C/oT9WUaOiTY4E80DB OSoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=E6y9tSZpU8w95kkNHTlolXhMFQbuXhA7RF54LfNxd4k=; b=nBS34DVB+Ad2VPObDMWFGhvifVqoY9Qx92GPH+pvVD7PX04oEttCrIHN+VSgpI0Hkj nEQeNvBv8Pmxe/tkBuiJ9zb4ZDqNpP8CAfEB60m7PzBJerGyrg7Odh6aqJIckfbixyWH hcaL4Gqt4heiEXlQw5W94aUIMS3EsYOrPxha2Of0OAOxP0mS596rAwsFGFKHQu8bbRz0 6m9be7JqJPGK4NX5ND5Jb59qaJJIl5XHBu0/yMYiEACcyAOQEBxPEqJKVASwZj6iG4Un WIFD0eIC4VOQ787tq4WJuI3i/4aYa4LtRYf8r0mF8Aa9qduhB7AMBlYW6d+5jRznWAOD C3Eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=K+deYr2v; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ce16si8902395ejc.526.2020.04.14.09.57.47; Tue, 14 Apr 2020 09:58:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=K+deYr2v; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2440646AbgDNQv3 (ORCPT + 99 others); Tue, 14 Apr 2020 12:51:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:55214 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2440403AbgDNQtU (ORCPT ); Tue, 14 Apr 2020 12:49:20 -0400 Received: from quaco.ghostprotocols.net (unknown [179.97.37.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 06E612085B; Tue, 14 Apr 2020 16:49:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586882959; bh=/HLIzKDPShz5RaDjsvp0+ObKOoCgb0n4Y+Ygpd+4qOc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K+deYr2vjnl3GJp9SEW0MiOhOm6KH7epX3MNvdNjyAdPAes90aO5j3TogOYg/mLsr WwPj4Sy6QXhSzSDi393M8k6CNBkKXfi8BI3X4HYVwrWv7JFvk9qHSOjgJ90FS4G5Kt i446vmsrlVkAfy85q02YZe2DzyOxySKcwX8Sgk0w= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Adrian Hunter , Brian Geffon Subject: [PATCH 06/15] tools headers UAPI: Sync linux/mman.h with the kernel Date: Tue, 14 Apr 2020 13:48:45 -0300 Message-Id: <20200414164854.26026-7-acme@kernel.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200414164854.26026-1-acme@kernel.org> References: <20200414164854.26026-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnaldo Carvalho de Melo To get the changes in: e346b3813067 ("mm/mremap: add MREMAP_DONTUNMAP to mremap()") Add that to 'perf trace's mremap 'flags' decoder. This silences this perf build warning: Warning: Kernel ABI header at 'tools/include/uapi/linux/mman.h' differs from latest version at 'include/uapi/linux/mman.h' diff -u tools/include/uapi/linux/mman.h include/uapi/linux/mman.h Cc: Adrian Hunter Cc: Jiri Olsa Cc: Namhyung Kim Cc: Brian Geffon Signed-off-by: Arnaldo Carvalho de Melo --- tools/include/uapi/linux/mman.h | 5 +++-- tools/perf/trace/beauty/mmap.c | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/include/uapi/linux/mman.h b/tools/include/uapi/linux/mman.h index fc1a64c3447b..923cc162609c 100644 --- a/tools/include/uapi/linux/mman.h +++ b/tools/include/uapi/linux/mman.h @@ -5,8 +5,9 @@ #include #include -#define MREMAP_MAYMOVE 1 -#define MREMAP_FIXED 2 +#define MREMAP_MAYMOVE 1 +#define MREMAP_FIXED 2 +#define MREMAP_DONTUNMAP 4 #define OVERCOMMIT_GUESS 0 #define OVERCOMMIT_ALWAYS 1 diff --git a/tools/perf/trace/beauty/mmap.c b/tools/perf/trace/beauty/mmap.c index 9fa771a90d79..862c8331dded 100644 --- a/tools/perf/trace/beauty/mmap.c +++ b/tools/perf/trace/beauty/mmap.c @@ -69,6 +69,7 @@ static size_t syscall_arg__scnprintf_mremap_flags(char *bf, size_t size, P_MREMAP_FLAG(MAYMOVE); P_MREMAP_FLAG(FIXED); + P_MREMAP_FLAG(DONTUNMAP); #undef P_MREMAP_FLAG if (flags) -- 2.21.1