Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

[linux-2.6] / include / asm-m32r / thread_info.h

diff --git a/include/asm-m32r/thread_info.h b/include/asm-m32r/thread_info.h
index b7ccc3e686047a8fe09814f6b6647bee5371320a..c039820dba7cf5d9685e8518d365e7a99c867957 100644 (file)
--- a/include/asm-m32r/thread_info.h
+++ b/include/asm-m32r/thread_info.h
@@ -100,9 +100,8 @@ static inline struct thread_info *current_thread_info(void)
        ({                                                      \
                struct thread_info *ret;                        \
                                                                \
-               ret = kmalloc(THREAD_SIZE, GFP_KERNEL);         \
-               if (ret)                                        \
-                       memset(ret, 0, THREAD_SIZE);            \
+               ret = kzalloc(THREAD_SIZE, GFP_KERNEL);         \
+                                                               \
                ret;                                            \
         })
 #else