From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: - alpha-fix-bootp-image-creation.patch removed from -mm tree Date: Mon, 07 May 2007 17:05:04 -0700 Message-ID: <200705080005.l48054tj009063@shell0.pdx.osdl.net> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([65.172.181.25]:45620 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967261AbXEHAGN (ORCPT ); Mon, 7 May 2007 20:06:13 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: ink@jurassic.park.msu.ru, jay.estabrook@hp.com, rth@twiddle.net, mm-commits@vger.kernel.org The patch titled ALPHA: fix BOOTP image creation has been removed from the -mm tree. Its filename was alpha-fix-bootp-image-creation.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: ALPHA: fix BOOTP image creation From: Ivan Kokshaysky Files: arch/alpha/boot/bootpz.c Create a dummy "__kmalloc()" to satisfy the loader; never called. arch/alpha/boot/tools/objstrip.c Remove an include that is now (2.6.x) unnecessary. Signed-off-by: Jay Estabrook Signed-off-by: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton --- arch/alpha/boot/bootpz.c | 6 ++++++ arch/alpha/boot/tools/objstrip.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff -puN arch/alpha/boot/bootpz.c~alpha-fix-bootp-image-creation arch/alpha/boot/bootpz.c --- a/arch/alpha/boot/bootpz.c~alpha-fix-bootp-image-creation +++ a/arch/alpha/boot/bootpz.c @@ -467,3 +467,9 @@ start_kernel(void) #endif runkernel(); } + + /* dummy function, should never be called. */ +void *__kmalloc(size_t size, gfp_t flags) +{ + return (void *)NULL; +} diff -puN arch/alpha/boot/tools/objstrip.c~alpha-fix-bootp-image-creation arch/alpha/boot/tools/objstrip.c --- a/arch/alpha/boot/tools/objstrip.c~alpha-fix-bootp-image-creation +++ a/arch/alpha/boot/tools/objstrip.c @@ -25,7 +25,6 @@ #include #include #include -#include #ifdef __ELF__ # include #endif _ Patches currently in -mm which might be from ink@jurassic.park.msu.ru are origin.patch kconfig-centralize-the-selection-of-semaphore-debugging.patch fixes-and-cleanups-for-earlyprintk-aka-boot-console.patch atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-alpha.patch local_t-alpha-extension.patch markers-alpha-and-avr32-supportadd-alpha-markerh-add-arm26-markerh.patch make-sure-nobodys-leaking-resources.patch