diff options
author | Julia Lawall <julia@diku.dk> | 2008-07-14 03:59:12 -0400 |
---|---|---|
committer | Heiko Carstens <heiko.carstens@de.ibm.com> | 2008-07-14 04:02:14 -0400 |
commit | 402a3998ba6ba81bae6ac586ada55a0dd6a7c287 (patch) | |
tree | 30aff19647e7d7119c749be6b3494e656c648c54 /arch/s390/kernel | |
parent | 9789db08c020193ae18826c3aa48bd24296f7848 (diff) |
[S390] arch/s390: 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.
arch/s390/kernel/topology.c | 2 --
1 file changed, 2 deletions(-)
This was fixed using the following semantic patch.
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
expression E;
statement S;
@@
E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...)
... when != E
(
- BUG_ON (E == NULL);
|
- if (E == NULL) S
)
@@
expression E,E1;
@@
E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...)
... when != E
- memset(E,0,E1);
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel')
-rw-r--r-- | arch/s390/kernel/topology.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c index 661a07217057..212d618b0095 100644 --- a/arch/s390/kernel/topology.c +++ b/arch/s390/kernel/topology.c | |||
@@ -313,8 +313,6 @@ void __init s390_init_cpu_topology(void) | |||
313 | machine_has_topology_irq = 1; | 313 | machine_has_topology_irq = 1; |
314 | 314 | ||
315 | tl_info = alloc_bootmem_pages(PAGE_SIZE); | 315 | tl_info = alloc_bootmem_pages(PAGE_SIZE); |
316 | if (!tl_info) | ||
317 | goto error; | ||
318 | info = tl_info; | 316 | info = tl_info; |
319 | stsi(info, 15, 1, 2); | 317 | stsi(info, 15, 1, 2); |
320 | 318 | ||