diff options
author | Julia Lawall <julia@diku.dk> | 2008-12-01 17:18:37 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2008-12-09 13:05:13 -0500 |
commit | 6afc9be1de0b938169d8985a3add0e3727ebc717 (patch) | |
tree | 61022bcd2ac12619e827b4b73791524c86071fba /arch/ia64/sn | |
parent | fc10212583996e248dde1da74cfeccd2f7e6b675 (diff) |
[IA64] eliminate NULL test and memset after alloc_bootmem
As noted by Akinobu Mita in patch b1fceac2b9e04d278316b2faddf276015fc06e3b,
alloc_bootmem and related functions never return NULL and always return a
zeroed region of memory. Thus a NULL test or memset after calls to these
functions is unnecessary.
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/sn')
-rw-r--r-- | arch/ia64/sn/kernel/setup.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c index bb1d24929640..b683eb355827 100644 --- a/arch/ia64/sn/kernel/setup.c +++ b/arch/ia64/sn/kernel/setup.c | |||
@@ -512,7 +512,6 @@ static void __init sn_init_pdas(char **cmdline_p) | |||
512 | for_each_online_node(cnode) { | 512 | for_each_online_node(cnode) { |
513 | nodepdaindr[cnode] = | 513 | nodepdaindr[cnode] = |
514 | alloc_bootmem_node(NODE_DATA(cnode), sizeof(nodepda_t)); | 514 | alloc_bootmem_node(NODE_DATA(cnode), sizeof(nodepda_t)); |
515 | memset(nodepdaindr[cnode], 0, sizeof(nodepda_t)); | ||
516 | memset(nodepdaindr[cnode]->phys_cpuid, -1, | 515 | memset(nodepdaindr[cnode]->phys_cpuid, -1, |
517 | sizeof(nodepdaindr[cnode]->phys_cpuid)); | 516 | sizeof(nodepdaindr[cnode]->phys_cpuid)); |
518 | spin_lock_init(&nodepdaindr[cnode]->ptc_lock); | 517 | spin_lock_init(&nodepdaindr[cnode]->ptc_lock); |
@@ -521,11 +520,9 @@ static void __init sn_init_pdas(char **cmdline_p) | |||
521 | /* | 520 | /* |
522 | * Allocate & initialize nodepda for TIOs. For now, put them on node 0. | 521 | * Allocate & initialize nodepda for TIOs. For now, put them on node 0. |
523 | */ | 522 | */ |
524 | for (cnode = num_online_nodes(); cnode < num_cnodes; cnode++) { | 523 | for (cnode = num_online_nodes(); cnode < num_cnodes; cnode++) |
525 | nodepdaindr[cnode] = | 524 | nodepdaindr[cnode] = |
526 | alloc_bootmem_node(NODE_DATA(0), sizeof(nodepda_t)); | 525 | alloc_bootmem_node(NODE_DATA(0), sizeof(nodepda_t)); |
527 | memset(nodepdaindr[cnode], 0, sizeof(nodepda_t)); | ||
528 | } | ||
529 | 526 | ||
530 | /* | 527 | /* |
531 | * Now copy the array of nodepda pointers to each nodepda. | 528 | * Now copy the array of nodepda pointers to each nodepda. |