From: Palmer Dabbelt <palmerdabbelt@xxxxxxxxxx> As far as I can tell this is not used by userspace and thus should not be part of the user-visible API. Since <uapi/asm-generic/setup.h> only contains COMMAND_LINE_SIZE we can just move it out of uapi to hide the definition and fix up the only direct use in Loongarch. Signed-off-by: Palmer Dabbelt <palmerdabbelt@xxxxxxxxxx> Link: https://lore.kernel.org/r/20210423025545.313965-1-palmer@xxxxxxxxxxx Signed-off-by: Palmer Dabbelt <palmer@xxxxxxxxxxxx> Signed-off-by: Alexandre Ghiti <alexghiti@xxxxxxxxxxxx> --- Documentation/admin-guide/kernel-parameters.rst | 2 +- arch/loongarch/include/asm/setup.h | 2 +- arch/sh/include/asm/setup.h | 2 +- include/asm-generic/Kbuild | 1 + include/{uapi => }/asm-generic/setup.h | 0 include/uapi/asm-generic/Kbuild | 1 - 6 files changed, 4 insertions(+), 4 deletions(-) rename include/{uapi => }/asm-generic/setup.h (100%) diff --git a/Documentation/admin-guide/kernel-parameters.rst b/Documentation/admin-guide/kernel-parameters.rst index 19600c50277b..2b94d5a42bd6 100644 --- a/Documentation/admin-guide/kernel-parameters.rst +++ b/Documentation/admin-guide/kernel-parameters.rst @@ -207,7 +207,7 @@ The number of kernel parameters is not limited, but the length of the complete command line (parameters including spaces etc.) is limited to a fixed number of characters. This limit depends on the architecture and is between 256 and 4096 characters. It is defined in the file -./include/uapi/asm-generic/setup.h as COMMAND_LINE_SIZE. +./include/asm-generic/setup.h as COMMAND_LINE_SIZE. Finally, the [KMG] suffix is commonly described after a number of kernel parameter values. These 'K', 'M', and 'G' letters represent the _binary_ diff --git a/arch/loongarch/include/asm/setup.h b/arch/loongarch/include/asm/setup.h index 72ead58039f3..86c99b183ea0 100644 --- a/arch/loongarch/include/asm/setup.h +++ b/arch/loongarch/include/asm/setup.h @@ -7,7 +7,7 @@ #define _LOONGARCH_SETUP_H #include <linux/types.h> -#include <uapi/asm/setup.h> +#include <asm-generic/setup.h> #define VECSIZE 0x200 diff --git a/arch/sh/include/asm/setup.h b/arch/sh/include/asm/setup.h index fc807011187f..ae09b1c29fd1 100644 --- a/arch/sh/include/asm/setup.h +++ b/arch/sh/include/asm/setup.h @@ -2,7 +2,7 @@ #ifndef _SH_SETUP_H #define _SH_SETUP_H -#include <uapi/asm/setup.h> +#include <asm-generic/setup.h> /* * This is set up by the setup-routine at boot-time diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild index 941be574bbe0..0fb55a119f54 100644 --- a/include/asm-generic/Kbuild +++ b/include/asm-generic/Kbuild @@ -49,6 +49,7 @@ mandatory-y += preempt.h mandatory-y += rwonce.h mandatory-y += sections.h mandatory-y += serial.h +mandatory-y += setup.h mandatory-y += shmparam.h mandatory-y += simd.h mandatory-y += softirq_stack.h diff --git a/include/uapi/asm-generic/setup.h b/include/asm-generic/setup.h similarity index 100% rename from include/uapi/asm-generic/setup.h rename to include/asm-generic/setup.h diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild index ebb180aac74e..0e7122339ee9 100644 --- a/include/uapi/asm-generic/Kbuild +++ b/include/uapi/asm-generic/Kbuild @@ -20,7 +20,6 @@ mandatory-y += posix_types.h mandatory-y += ptrace.h mandatory-y += resource.h mandatory-y += sembuf.h -mandatory-y += setup.h mandatory-y += shmbuf.h mandatory-y += sigcontext.h mandatory-y += siginfo.h -- 2.37.2
