2009-06-17 06:42:46

by Pekka Enberg

[permalink] [raw]
Subject: [PATCH] s390: remove DEBUG_MALLOC

From: Pekka Enberg <[email protected]>

The kernel now has kmemleak and kmemtrace so there's no reason to keep
this ugly s390 hack around. I am not sure how it's supposed to work on
SMP anyway as it uses a global variable to temporarily store the return
value of all kmalloc() calls:

void *b;

#define kmalloc(x...) (PRINT_INFO(" kmalloc %p\n",b=kmalloc(x)),b)

Cc: <[email protected]>
Cc: Heiko Carstens <[email protected]>
Cc: Martin Schwidefsky <[email protected]>
Signed-off-by: Pekka Enberg <[email protected]>
---
arch/s390/include/asm/debug.h | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/arch/s390/include/asm/debug.h b/arch/s390/include/asm/debug.h
index 9450ce6..31ed568 100644
--- a/arch/s390/include/asm/debug.h
+++ b/arch/s390/include/asm/debug.h
@@ -248,14 +248,5 @@ int debug_unregister_view(debug_info_t* id, struct debug_view* view);
#define PRINT_FATAL(x...) printk ( KERN_DEBUG PRINTK_HEADER x )
#endif /* DASD_DEBUG */

-#undef DEBUG_MALLOC
-#ifdef DEBUG_MALLOC
-void *b;
-#define kmalloc(x...) (PRINT_INFO(" kmalloc %p\n",b=kmalloc(x)),b)
-#define kfree(x) PRINT_INFO(" kfree %p\n",x);kfree(x)
-#define get_zeroed_page(x...) (PRINT_INFO(" gfp %p\n",b=get_zeroed_page(x)),b)
-#define __get_free_pages(x...) (PRINT_INFO(" gfps %p\n",b=__get_free_pages(x)),b)
-#endif /* DEBUG_MALLOC */
-
#endif /* __KERNEL__ */
#endif /* DEBUG_H */
--
1.5.6.3


2009-06-17 07:24:19

by Martin Schwidefsky

[permalink] [raw]
Subject: Re: [PATCH] s390: remove DEBUG_MALLOC

On Wed, 17 Jun 2009 09:42:38 +0300 (EEST)
Pekka J Enberg <[email protected]> wrote:

> The kernel now has kmemleak and kmemtrace so there's no reason to keep
> this ugly s390 hack around. I am not sure how it's supposed to work on
> SMP anyway as it uses a global variable to temporarily store the return
> value of all kmalloc() calls:
>
> void *b;
>
> #define kmalloc(x...) (PRINT_INFO(" kmalloc %p\n",b=kmalloc(x)),b)

Ouch! Yes, we better remove this quickly before anybody else sees it.
I'll add it to git390.

--
blue skies,
Martin.

"Reality continues to ruin my life." - Calvin.