The kernel function prototypes are of no use for userspace and
shouldn't get exposed in an uapi header, so let's move them into
an internal header instead.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 arch/hexagon/include/asm/setup.h      | 20 ++++++++++++++++++++
 arch/hexagon/include/uapi/asm/setup.h | 14 ++------------
 2 files changed, 22 insertions(+), 12 deletions(-)
 create mode 100644 arch/hexagon/include/asm/setup.h

diff --git a/arch/hexagon/include/asm/setup.h b/arch/hexagon/include/asm/setup.h
new file mode 100644
index 000000000000..9f2749cd4052
--- /dev/null
+++ b/arch/hexagon/include/asm/setup.h
@@ -0,0 +1,20 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ */
+
+#ifndef _ASM_HEXAGON_SETUP_H
+#define _ASM_HEXAGON_SETUP_H
+
+#include <linux/init.h>
+#include <uapi/asm/setup.h>
+
+extern char external_cmdline_buffer;
+
+void __init setup_arch_memory(void);
+
+#endif
diff --git a/arch/hexagon/include/uapi/asm/setup.h b/arch/hexagon/include/uapi/asm/setup.h
index 8ce9428b1583..598f74f671f6 100644
--- a/arch/hexagon/include/uapi/asm/setup.h
+++ b/arch/hexagon/include/uapi/asm/setup.h
@@ -17,19 +17,9 @@
  * 02110-1301, USA.
  */
 
-#ifndef _ASM_SETUP_H
-#define _ASM_SETUP_H
-
-#ifdef __KERNEL__
-#include <linux/init.h>
-#else
-#define __init
-#endif
+#ifndef _UAPI_ASM_HEXAGON_SETUP_H
+#define _UAPI_ASM_HEXAGON_SETUP_H
 
 #include <asm-generic/setup.h>
 
-extern char external_cmdline_buffer;
-
-void __init setup_arch_memory(void);
-
 #endif
-- 
2.44.0

On 02/05/2024 19.38, Thomas Huth wrote:
> The kernel function prototypes are of no use for userspace and
> shouldn't get exposed in an uapi header, so let's move them into
> an internal header instead.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   arch/hexagon/include/asm/setup.h      | 20 ++++++++++++++++++++
>   arch/hexagon/include/uapi/asm/setup.h | 14 ++------------
>   2 files changed, 22 insertions(+), 12 deletions(-)
>   create mode 100644 arch/hexagon/include/asm/setup.h
> 
> diff --git a/arch/hexagon/include/asm/setup.h b/arch/hexagon/include/asm/setup.h
> new file mode 100644
> index 000000000000..9f2749cd4052
> --- /dev/null
> +++ b/arch/hexagon/include/asm/setup.h
> @@ -0,0 +1,20 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +/*
> + * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 and
> + * only version 2 as published by the Free Software Foundation.
> + */
> +
> +#ifndef _ASM_HEXAGON_SETUP_H
> +#define _ASM_HEXAGON_SETUP_H
> +
> +#include <linux/init.h>
> +#include <uapi/asm/setup.h>
> +
> +extern char external_cmdline_buffer;
> +
> +void __init setup_arch_memory(void);
> +
> +#endif
> diff --git a/arch/hexagon/include/uapi/asm/setup.h b/arch/hexagon/include/uapi/asm/setup.h
> index 8ce9428b1583..598f74f671f6 100644
> --- a/arch/hexagon/include/uapi/asm/setup.h
> +++ b/arch/hexagon/include/uapi/asm/setup.h
> @@ -17,19 +17,9 @@
>    * 02110-1301, USA.
>    */
>   
> -#ifndef _ASM_SETUP_H
> -#define _ASM_SETUP_H
> -
> -#ifdef __KERNEL__
> -#include <linux/init.h>
> -#else
> -#define __init
> -#endif
> +#ifndef _UAPI_ASM_HEXAGON_SETUP_H
> +#define _UAPI_ASM_HEXAGON_SETUP_H
>   
>   #include <asm-generic/setup.h>
>   
> -extern char external_cmdline_buffer;
> -
> -void __init setup_arch_memory(void);
> -
>   #endif

Ping?

  Thomas