diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-02-21 17:02:56 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-02-21 17:02:56 +0300 |
| commit | affe678f355738db56361d124757c38c09401341 (patch) | |
| tree | b3583e474859a83c42b0c469c3a20342e0f51423 /lib | |
| parent | 675204778c69c2b3e0f6a4e2dbfeb4f3e89194ba (diff) | |
| parent | 0ad2507d5d93f39619fc42372c347d6006b64319 (diff) | |
| download | linux-affe678f355738db56361d124757c38c09401341.tar.xz | |
Merge tag 'v6.14-rc3' into x86/mm, to pick up fixes before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stackinit_kunit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/stackinit_kunit.c b/lib/stackinit_kunit.c index fbe910c9c825..135322592faf 100644 --- a/lib/stackinit_kunit.c +++ b/lib/stackinit_kunit.c @@ -75,8 +75,10 @@ static bool stackinit_range_contains(char *haystack_start, size_t haystack_size, */ #ifdef CONFIG_M68K #define FILL_SIZE_STRING 8 +#define FILL_SIZE_ARRAY 2 #else #define FILL_SIZE_STRING 16 +#define FILL_SIZE_ARRAY 8 #endif #define INIT_CLONE_SCALAR /**/ @@ -345,11 +347,11 @@ union test_small_start { short three; unsigned long four; struct big_struct { - unsigned long array[8]; + unsigned long array[FILL_SIZE_ARRAY]; } big; }; -/* Mismatched sizes, with one and two being small */ +/* Mismatched sizes, with three and four being small */ union test_small_end { short one; unsigned long two; |