Index: linux-2.6.14-rc2/kernel/intermodule.c
===================================================================
--- linux-2.6.14-rc2.orig/kernel/intermodule.c	2005-09-19 20:00:41.000000000 -0700
+++ linux-2.6.14-rc2/kernel/intermodule.c	2005-09-22 16:12:14.000000000 -0700
@@ -39,7 +39,7 @@ void inter_module_register(const char *i
 	struct list_head *tmp;
 	struct inter_module_entry *ime, *ime_new;
 
-	if (!(ime_new = kzalloc(sizeof(*ime), GFP_KERNEL))) {
+	if (!(ime_new = kmalloc(sizeof(*ime), GFP_KERNEL | __GFPZERO))) {
 		/* Overloaded kernel, not fatal */
 		printk(KERN_ERR
 			"Aiee, inter_module_register: cannot kmalloc entry for '%s'\n",
Index: linux-2.6.14-rc2/fs/eventpoll.c
===================================================================
--- linux-2.6.14-rc2.orig/fs/eventpoll.c	2005-09-19 20:00:41.000000000 -0700
+++ linux-2.6.14-rc2/fs/eventpoll.c	2005-09-22 16:10:59.000000000 -0700
@@ -780,7 +780,7 @@ eexit_1:
 
 static int ep_alloc(struct eventpoll **pep)
 {
-	struct eventpoll *ep = kzalloc(sizeof(*ep), GFP_KERNEL);
+	struct eventpoll *ep = kmalloc(sizeof(*ep), GFP_KERNEL | __GFP_ZERO);
 
 	if (!ep)
 		return -ENOMEM;
Index: linux-2.6.14-rc2/Documentation/CodingStyle
===================================================================
--- linux-2.6.14-rc2.orig/Documentation/CodingStyle	2005-09-19 20:00:41.000000000 -0700
+++ linux-2.6.14-rc2/Documentation/CodingStyle	2005-09-22 16:11:27.000000000 -0700
@@ -413,7 +413,7 @@ Printing numbers in parentheses (%d) add
 		Chapter 13: Allocating memory
 
 The kernel provides the following general purpose memory allocators:
-kmalloc(), kzalloc(), kcalloc(), and vmalloc().  Please refer to the API
+kmalloc(), kcalloc(), and vmalloc().  Please refer to the API
 documentation for further information about them.
 
 The preferred form for passing a size of a struct is the following:
Index: linux-2.6.14-rc2/include/linux/slab.h
===================================================================
--- linux-2.6.14-rc2.orig/include/linux/slab.h	2005-09-22 15:56:49.000000000 -0700
+++ linux-2.6.14-rc2/include/linux/slab.h	2005-09-22 16:10:14.000000000 -0700
@@ -99,8 +99,6 @@ found:
 	return __kmalloc(size, flags);
 }
 
-#define kzalloc(__size, __flags) kmalloc(__size, (__flags) | __GFP_ZERO)
-
 /**
  * kcalloc - allocate memory for an array. The memory is set to zero.
  * @n: number of elements.
Index: linux-2.6.14-rc2/kernel/params.c
===================================================================
--- linux-2.6.14-rc2.orig/kernel/params.c	2005-09-19 20:00:41.000000000 -0700
+++ linux-2.6.14-rc2/kernel/params.c	2005-09-22 16:12:53.000000000 -0700
@@ -542,7 +542,7 @@ static void __init kernel_param_sysfs_se
 {
 	struct module_kobject *mk;
 
-	mk = kzalloc(sizeof(struct module_kobject), GFP_KERNEL);
+	mk = kmalloc(sizeof(struct module_kobject), GFP_KERNEL | __GFP_ZERO);
 	BUG_ON(!mk);
 
 	mk->mod = THIS_MODULE;