From: Masahiro Yamada <masahiroy@kernel.org>
Date: Sun, 21 May 2023 16:04:21 +0000 (+0900)
Subject: modpost: merge fromsec=DATA_SECTIONS entries in sectioncheck table
X-Git-Tag: v6.5-rc1~93^2~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4323e83505247d2aca1e2488f69da9aab8ad03f;p=thirdparty%2Fkernel%2Fstable.git

modpost: merge fromsec=DATA_SECTIONS entries in sectioncheck table

You can merge these entries.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
---

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 1018cd9ced715..21417a4a7655d 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -900,12 +900,7 @@ static const struct sectioncheck sectioncheck[] = {
 },
 {
 	.fromsec = { DATA_SECTIONS, NULL },
-	.bad_tosec = { ALL_XXXINIT_SECTIONS, NULL },
-	.mismatch = DATA_TO_ANY_INIT,
-},
-{
-	.fromsec = { DATA_SECTIONS, NULL },
-	.bad_tosec = { INIT_SECTIONS, NULL },
+	.bad_tosec = { ALL_XXXINIT_SECTIONS, INIT_SECTIONS, NULL },
 	.mismatch = DATA_TO_ANY_INIT,
 },
 {