From c695724c1b665a37fa66376e0666a2a9fd5ecae7 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 10 Dec 2023 10:03:47 -0500 Subject: [PATCH] Drop kbuild-use-wdeclaration-after-statement.patch Signed-off-by: Sasha Levin --- ...ild-use-wdeclaration-after-statement.patch | 91 ------------------- queue-5.15/series | 1 - 2 files changed, 92 deletions(-) delete mode 100644 queue-5.15/kbuild-use-wdeclaration-after-statement.patch diff --git a/queue-5.15/kbuild-use-wdeclaration-after-statement.patch b/queue-5.15/kbuild-use-wdeclaration-after-statement.patch deleted file mode 100644 index 47eb36f5088..00000000000 --- a/queue-5.15/kbuild-use-wdeclaration-after-statement.patch +++ /dev/null @@ -1,91 +0,0 @@ -From c06a25dc5234f3654a23eb292536f8f7f6a69a8f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 8 Mar 2022 22:56:13 +0100 -Subject: Kbuild: use -Wdeclaration-after-statement -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Mark Rutland - -[ Upstream commit 4d94f910e79a349b00a4f8aab6f3ae87129d8c5a ] - -The kernel is moving from using `-std=gnu89` to `-std=gnu11`, permitting -the use of additional C11 features such as for-loop initial declarations. - -One contentious aspect of C99 is that it permits mixed declarations and -code, and for now at least, it seems preferable to enforce that -declarations must come first. - -These warnings were already enabled in the kernel itself, but not -for KBUILD_USERCFLAGS or the compat VDSO on arch/arm64, which uses -a separate set of CFLAGS. - -This patch fixes an existing violation in modpost.c, which is not -reported because of the missing flag in KBUILD_USERCFLAGS: - -| scripts/mod/modpost.c: In function ‘match’: -| scripts/mod/modpost.c:837:3: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] -| 837 | const char *endp = p + strlen(p) - 1; -| | ^~~~~ - -Signed-off-by: Mark Rutland -[arnd: don't add a duplicate flag to the default set, update changelog] -Signed-off-by: Arnd Bergmann -Reviewed-by: Nathan Chancellor -Reviewed-by: Nick Desaulniers -Tested-by: Sedat Dilek # LLVM/Clang v13.0.0 (x86-64) -Signed-off-by: Masahiro Yamada -Stable-dep-of: cbf54f37600e ("platform/x86: wmi: Skip blocks with zero instances") -Signed-off-by: Sasha Levin ---- - Makefile | 3 ++- - arch/arm64/kernel/vdso32/Makefile | 1 + - scripts/mod/modpost.c | 4 +++- - 3 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 678e712591f89..5976e71522607 100644 ---- a/Makefile -+++ b/Makefile -@@ -440,7 +440,8 @@ endif - HOSTPKG_CONFIG = pkg-config - - export KBUILD_USERCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes \ -- -O2 -fomit-frame-pointer -std=gnu89 -+ -O2 -fomit-frame-pointer -std=gnu89 \ -+ -Wdeclaration-after-statement - export KBUILD_USERLDFLAGS := - - KBUILD_HOSTCFLAGS := $(KBUILD_USERCFLAGS) $(HOST_LFS_CFLAGS) $(HOSTCFLAGS) -diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile -index 83e9399e38368..50cb1ec092ae5 100644 ---- a/arch/arm64/kernel/vdso32/Makefile -+++ b/arch/arm64/kernel/vdso32/Makefile -@@ -76,6 +76,7 @@ VDSO_CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ - -fno-strict-aliasing -fno-common \ - -Werror-implicit-function-declaration \ - -Wno-format-security \ -+ -Wdeclaration-after-statement \ - -std=gnu89 - VDSO_CFLAGS += -O2 - # Some useful compiler-dependent flags from top-level Makefile -diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index c6e655e0ed988..945f9ecb34079 100644 ---- a/scripts/mod/modpost.c -+++ b/scripts/mod/modpost.c -@@ -833,8 +833,10 @@ static int match(const char *sym, const char * const pat[]) - { - const char *p; - while (*pat) { -+ const char *endp; -+ - p = *pat++; -- const char *endp = p + strlen(p) - 1; -+ endp = p + strlen(p) - 1; - - /* "*foo*" */ - if (*p == '*' && *endp == '*') { --- -2.42.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 764b9ec1480..f3d0e580572 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -12,7 +12,6 @@ platform-x86-asus-wmi-simplify-tablet-mode-switch-pr.patch platform-x86-asus-wmi-simplify-tablet-mode-switch-ha.patch platform-x86-asus-wmi-move-i8042-filter-install-to-s.patch of-dynamic-fix-of_reconfig_get_state_change-return-v.patch -kbuild-use-wdeclaration-after-statement.patch kbuild-move-to-std-gnu11.patch platform-x86-wmi-allow-duplicate-guids-for-drivers-t.patch platform-x86-wmi-skip-blocks-with-zero-instances.patch -- 2.47.3