diff options
author | 2025-02-25 04:04:46 -0500 | |
---|---|---|
committer | 2025-02-25 04:04:46 -0500 | |
commit | 230804a89319a76c6e653caadc98a870877548cc (patch) | |
tree | 27113d25cebb6a5c868e7c35a29809921223f86f /lib/stackinit_kunit.c | |
parent | RDMA/hfi1: Remove unused one_qsfp_write (diff) | |
parent | net/mlx5: Change POOL_NEXT_SIZE define value and make it global (diff) | |
download | wireguard-linux-230804a89319a76c6e653caadc98a870877548cc.tar.xz wireguard-linux-230804a89319a76c6e653caadc98a870877548cc.zip |
Merge branch 'mlx5-next' into wip/leon-for-next
This is merge of shared branch between RDMA and net-next trees.
* mlx5-next: (550 commits)
net/mlx5: Change POOL_NEXT_SIZE define value and make it global
net/mlx5: Add new health syndrome error and crr bit offset
Linux 6.14-rc3
...
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Diffstat (limited to '')
-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; |