| From 7b611ad8f41306e8eca9ab094cb1d3b3fed55eaa Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 28 Jun 2021 19:33:41 -0700 |
| Subject: ia64: mca_drv: fix incorrect array size calculation |
| |
| From: Arnd Bergmann <arnd@arndb.de> |
| |
| [ Upstream commit c5f320ff8a79501bb59338278336ec43acb9d7e2 ] |
| |
| gcc points out a mistake in the mca driver that goes back to before the |
| git history: |
| |
| arch/ia64/kernel/mca_drv.c: In function 'init_record_index_pools': |
| arch/ia64/kernel/mca_drv.c:346:54: error: expression does not compute the number of elements in this array; element typ |
| e is 'int', not 'size_t' {aka 'long unsigned int'} [-Werror=sizeof-array-div] |
| 346 | for (i = 1; i < sizeof sal_log_sect_min_sizes/sizeof(size_t); i++) |
| | ^ |
| |
| This is the same as sizeof(size_t), which is two shorter than the actual |
| array. Use the ARRAY_SIZE() macro to get the correct calculation instead. |
| |
| Link: https://lkml.kernel.org/r/20210514214123.875971-1-arnd@kernel.org |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Cc: Masahiro Yamada <masahiroy@kernel.org> |
| Cc: Randy Dunlap <rdunlap@infradead.org> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/ia64/kernel/mca_drv.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c |
| index 4d0ab323dee8..2a40268c3d49 100644 |
| --- a/arch/ia64/kernel/mca_drv.c |
| +++ b/arch/ia64/kernel/mca_drv.c |
| @@ -343,7 +343,7 @@ init_record_index_pools(void) |
| |
| /* - 2 - */ |
| sect_min_size = sal_log_sect_min_sizes[0]; |
| - for (i = 1; i < sizeof sal_log_sect_min_sizes/sizeof(size_t); i++) |
| + for (i = 1; i < ARRAY_SIZE(sal_log_sect_min_sizes); i++) |
| if (sect_min_size > sal_log_sect_min_sizes[i]) |
| sect_min_size = sal_log_sect_min_sizes[i]; |
| |
| -- |
| 2.30.2 |
| |
