From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S964908AbdKGBBw (ORCPT <rfc822;w@1wt.eu>);
        Mon, 6 Nov 2017 20:01:52 -0500
Received: from foss.arm.com ([217.140.101.70]:43092 "EHLO foss.arm.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S932593AbdKGBBu (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 6 Nov 2017 20:01:50 -0500
Date: Tue, 7 Nov 2017 01:01:54 +0000
From: Will Deacon <will.deacon@arm.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>,
        "Luis R. Rodriguez" <mcgrof@kernel.org>,
        Kees Cook <keescook@chromium.org>,
        Alex =?iso-8859-1?Q?Benn=E9e?= <alex.bennee@linaro.org>,
        Dave Martin <Dave.Martin@arm.com>,
        "Eric W. Biederman" <ebiederm@xmission.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Thomas Gleixner <tglx@linutronix.de>, linux-kernel@vger.kernel.org,
        linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH] sysctl: add register_sysctl() dummy helper
Message-ID: <20171107010154.GC12761@arm.com>
References: <20171106133700.558647-1-arnd@arndb.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20171106133700.558647-1-arnd@arndb.de>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Nov 06, 2017 at 02:36:40PM +0100, Arnd Bergmann wrote:
> The register_sysctl() function has been around for five years with commit
> fea478d4101a ("sysctl: Add register_sysctl for normal sysctl users")
> but now that arm64 started using it, I ran into a compile error:
> 
> arch/arm64/kernel/armv8_deprecated.c: In function 'register_insn_emulation_sysctl':
> arch/arm64/kernel/armv8_deprecated.c:257:2: error: implicit declaration of function 'register_sysctl'
> 
> This adds a inline function like we already have for register_sysctl_paths()
> and register_sysctl_table().
> 
> Fixes: 38b9aeb32fa7 ("arm64: Port deprecated instruction emulation to new sysctl interface")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> This should probably get merged through the arm64 tree to avoid
> bisection problems.
> ---
>  include/linux/sysctl.h | 5 +++++
>  1 file changed, 5 insertions(+)

Assuming Andrew can pick this up, so:

Acked-by: Will Deacon <will.deacon@arm.com>

Will

> diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
> index fabe15e51c56..992bc9948232 100644
> --- a/include/linux/sysctl.h
> +++ b/include/linux/sysctl.h
> @@ -216,6 +216,11 @@ static inline struct ctl_table_header *register_sysctl_paths(
>  	return NULL;
>  }
>  
> +static inline struct ctl_table_header *register_sysctl(const char *path, struct ctl_table *table)
> +{
> +	return NULL;
> +}
> +
>  static inline void unregister_sysctl_table(struct ctl_table_header * table)
>  {
>  }
> -- 
> 2.9.0
>