From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: - arch-powerpc-eliminate-null-test-and-memset-after-alloc_bootmem.patch removed from -mm tree Date: Sat, 06 Dec 2008 16:05:00 -0800 Message-ID: <200812070005.mB7050Ch021069@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:51770 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753500AbYLGAFI (ORCPT ); Sat, 6 Dec 2008 19:05:08 -0500 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: julia@diku.dk, benh@kernel.crashing.org, paulus@samba.org, mm-commits@vger.kernel.org The patch titled arch/powerpc: eliminate NULL test and memset after alloc_bootmem has been removed from the -mm tree. Its filename was arch-powerpc-eliminate-null-test-and-memset-after-alloc_bootmem.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: arch/powerpc: eliminate NULL test and memset after alloc_bootmem From: Julia Lawall 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. This was fixed using the following semantic patch. (http://www.emn.fr/x-info/coccinelle/) // @@ expression E; statement S; @@ E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\|alloc_bootmem_node\|alloc_bootmem_low_pages_node\|alloc_bootmem_pages_node\)(...) ... 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\|alloc_bootmem_node\|alloc_bootmem_low_pages_node\|alloc_bootmem_pages_node\)(...) ... when != E - memset(E,0,E1); // Signed-off-by: Julia Lawall Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton --- arch/powerpc/kernel/setup_64.c | 2 -- 1 file changed, 2 deletions(-) diff -puN arch/powerpc/kernel/setup_64.c~arch-powerpc-eliminate-null-test-and-memset-after-alloc_bootmem arch/powerpc/kernel/setup_64.c --- a/arch/powerpc/kernel/setup_64.c~arch-powerpc-eliminate-null-test-and-memset-after-alloc_bootmem +++ a/arch/powerpc/kernel/setup_64.c @@ -606,8 +606,6 @@ void __init setup_per_cpu_areas(void) for_each_possible_cpu(i) { ptr = alloc_bootmem_pages_node(NODE_DATA(cpu_to_node(i)), size); - if (!ptr) - panic("Cannot allocate cpu data for CPU %d\n", i); paca[i].data_offset = ptr - __per_cpu_start; memcpy(ptr, __per_cpu_start, __per_cpu_end - __per_cpu_start); _ Patches currently in -mm which might be from julia@diku.dk are linux-next.patch arch-arm-eliminate-null-test-and-memset-after-alloc_bootmem.patch arch-avr32-eliminate-null-test-and-memset-after-alloc_bootmem.patch drivers-media-video-cx88-cx88-alsac-adjust-error-handling-code.patch arch-ia64-eliminate-null-test-and-memset-after-alloc_bootmem.patch drivers-mtd-maps-nettelc-use-array_size.patch net-tipc-bcasth-use-array_size.patch drivers-isdn-misdn-use-array_size.patch fs-namespacec-drop-code-after-return.patch mm-page_allocc-eliminate-null-test-and-memset-after-alloc_bootmem.patch