From patchwork Sun Aug 7 17:28:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 12938186 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id BEEAAC25B0C for ; Sun, 7 Aug 2022 17:29:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AE9228E0002; Sun, 7 Aug 2022 13:29:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A98C28E0001; Sun, 7 Aug 2022 13:29:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 987C98E0002; Sun, 7 Aug 2022 13:29:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 8AADE8E0001 for ; Sun, 7 Aug 2022 13:29:08 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 55AFF1202A7 for ; Sun, 7 Aug 2022 17:29:08 +0000 (UTC) X-FDA: 79773482376.09.59DEE63 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf03.hostedemail.com (Postfix) with ESMTP id 6D93720152 for ; Sun, 7 Aug 2022 17:29:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=tMRPcSMjjbccZSrtFDCivTz/DFBFKj1Hj0OrpfCNU18=; b=RsUnPXn+b5CGYQfXWgONPsik0O NtaqPRVCaqPMFSeFpsTutpK7KwacMT0+/AP7t6RSuCaly0eDiFpT9fWZ3KtTDCdxVJiRFPUyLXflF QvyGdX9xY5S4jCKIGqVuY2O1+v/SQ1pM7xUGTe8Y1DAq5bI4pLa4gxp7ZGQSzFADhKXAuvD+YsPzT dsQp3tAAd3MibNz0h20NdZ8yrJv09+l2Pg8K/SFx/jM9Zjne1mnSszY4kMFs7P/Rtc2K3TilXeqYN +3c3ttQA2BNe9/hODzpwcTzw4tiBOro/+IRt73cYcZ1ORB/g15on7jnOxtZpwAomfeYhlTCdbt/Ol xwED+Sdw==; Received: from [2601:1c0:6280:3f0::a6b3] (helo=casper.infradead.org) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1oKk5E-00DB4U-MS; Sun, 07 Aug 2022 17:29:01 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Paul Walmsley , Palmer Dabbelt , Albert Ou , linux-riscv@lists.infradead.org, Arnd Bergmann , linux-arch@vger.kernel.org, Andrew Morton , linux-mm@kvack.org Subject: [PATCH] asm-generic: unistd.h: make 'compat_sys_fadvise64_64' conditional Date: Sun, 7 Aug 2022 10:28:54 -0700 Message-Id: <20220807172854.12971-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659893347; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=tMRPcSMjjbccZSrtFDCivTz/DFBFKj1Hj0OrpfCNU18=; b=Nr1eEFnv7V9mMvvr/iROlRaaFMgKzMEL7LdlahCt20Hvr/dgmcnyEa3BhxxIDqoZIVdJ9F AFdYijsXo0iP+dTCXO8yFHUcJggnxfbscQl0gjhoPS+5Z12IS4e+QT7QAAg8r69ydW2GNj oTEiAbGP7OhH7Nwk9lpNpZ564Vp+i0Q= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=RsUnPXn+; dmarc=none; spf=none (imf03.hostedemail.com: domain of rdunlap@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=rdunlap@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659893347; a=rsa-sha256; cv=none; b=vbGKPPQ1JgSqt+UNBwTlWmMLvVisgPeED/QYYQmqRr2zM1roMgmdmPEoVrWsG1HpSlbu2A tgOzR6gUKJGfjq54iMELvXkMQNblFGHgOY6TOmNenrADCaJOFtCxUK85U1EZVJR6G21K29 SvIHqC3gYSnUlYEAE2cIMfkkPK4vFcE= X-Rspamd-Queue-Id: 6D93720152 Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=RsUnPXn+; dmarc=none; spf=none (imf03.hostedemail.com: domain of rdunlap@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=rdunlap@infradead.org X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: 8cxgdhd465sauomu4hbtnczqm8k8x9dq X-HE-Tag: 1659893347-83893 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Don't require 'compat_sys_fadvise64_64' when __ARCH_WANT_COMPAT_FADVISE64_64 is not set. Fixes this build error when CONFIG_ADVISE_SYSCALLS is not set: include/uapi/asm-generic/unistd.h:649:49: error: 'compat_sys_fadvise64_64' undeclared here (not in a function); did you mean 'ksys_fadvise64_64'? 649 | __SC_COMP(__NR3264_fadvise64, sys_fadvise64_64, compat_sys_fadvise64_64) arch/riscv/kernel/compat_syscall_table.c:12:42: note: in definition of macro '__SYSCALL' 12 | #define __SYSCALL(nr, call) [nr] = (call), include/uapi/asm-generic/unistd.h:649:1: note: in expansion of macro '__SC_COMP' 649 | __SC_COMP(__NR3264_fadvise64, sys_fadvise64_64, compat_sys_fadvise64_64) Signed-off-by: Randy Dunlap Cc: Paul Walmsley Cc: Palmer Dabbelt Cc: Albert Ou Cc: linux-riscv@lists.infradead.org Cc: Arnd Bergmann Cc: linux-arch@vger.kernel.org Cc: Andrew Morton Cc: linux-mm@kvack.org --- include/uapi/asm-generic/unistd.h | 2 ++ 1 file changed, 2 insertions(+) --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -645,8 +645,10 @@ __SC_COMP(__NR_execve, sys_execve, compa #define __NR3264_mmap 222 __SC_3264(__NR3264_mmap, sys_mmap2, sys_mmap) /* mm/fadvise.c */ +#ifdef __ARCH_WANT_COMPAT_FADVISE64_64 #define __NR3264_fadvise64 223 __SC_COMP(__NR3264_fadvise64, sys_fadvise64_64, compat_sys_fadvise64_64) +#endif /* mm/, CONFIG_MMU only */ #ifndef __ARCH_NOMMU