Fix zeroing of PDAs
PATCH 1/2 Fix zeroing of PDAs
From: Thierry Reding <[email protected]>
The code uses a the following to zero out a PDA:
memset(pda, 0, sizeof(pda));
But sizeof(pda) will return the size of a pointer rather than the size of the structure pointed to. This triggers the following warning from GCC:
arch/ia64/sn/kernel/setup.c:582:23: warning: argument to 'sizeof' in 'memset' call is the same pointer type 'struct pda_s *' as the destination; expected 'struct pda_s' or an explicit length [-Wsizeof-pointer-memaccess] memset(pda, 0, sizeof(pda)); ^
Fix this by passing in the size of the structure using sizeof(*pda) instead.
Signed-off-by Thierry Reding <[email protected]>
--- arch/ia64/sn/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/ia64/sn/kernel/setup.c +1 -1
@@ -579,7 +579,7 @@ void sn_cpu_init(void) (sn_prom_type = 1) ? "real" : "fake"); } -memset (pda,0 ,sizeof (pda)); +memset (pda,0 ,sizeof (*pda)); if (ia64_sn_get_sn_info(0, &sn_hub_info->shub2, &sn_hub_info->nasid_bitmask, &sn_hub_info->nasid_shift,
Signature · 1 line
2.0.2
PATCH 2/2 Do not needlessly convert between pointers and integers
From: Thierry Reding <[email protected]>
The nasid_to_try variable is an array of integers, so plain integers can be used when assigning values to the elements rather than casting a NULL pointer to an integer, which results in the following warning from GCC:
arch/ia64/sn/kernel/bte.c:117:22: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] nasid_to_try[1] = (int)NULL; ^ arch/ia64/sn/kernel/bte.c:125:22: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] nasid_to_try[1] = (int)NULL; ^
Replace (int)NULL with a simple 0 to silence these warnings.
Signed-off-by Thierry Reding <[email protected]>
--- arch/ia64/sn/kernel/bte.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/ia64/sn/kernel/bte.c +2 -2
@@ -114,7 +114,7 @@ bte_result_t bte_copy(u64 src, u64 dest, u64 len, u64 mode, void *notification)if (mode &BTE_USE_ANY ) { nasid_to_try[1 ] = my_nasid; }else { - nasid_to_try[1 ] = (int )NULL ; + nasid_to_try[1 ] =0 ; } }else {/* try local then remote */
@@ -122,7 +122,7 @@ bte_result_t bte_copy(u64 src, u64 dest, u64 len, u64 mode, void *notification)if (mode &BTE_USE_ANY ) { nasid_to_try[1 ] =NASID_GET (dest); }else { - nasid_to_try[1 ] = (int )NULL ; + nasid_to_try[1 ] =0 ; } }
Signature · 1 line
2.0.2