From 538d96ec17eec20ac1c6017dee6ef107e812b546 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Tue, 4 Oct 2005 22:38:44 -0700
Subject: [PATCH] --- yaml --- r: 9660 b: refs/heads/master c:
 7b5b3f3d826ea87c224c66de9c95c09e7f110ecd h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/atm/fore200e.c | 10 ++++------
 trunk/include/linux/atmdev.h |  2 +-
 trunk/net/atm/atm_misc.c     |  2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 254d387d2794..6294fcb322d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5181ab06ddca8071b4eb54ac2c314f7d24825d4
+refs/heads/master: 7b5b3f3d826ea87c224c66de9c95c09e7f110ecd
diff --git a/trunk/drivers/atm/fore200e.c b/trunk/drivers/atm/fore200e.c
index 2bf723a7b6e6..6f1a83c9d9e0 100644
--- a/trunk/drivers/atm/fore200e.c
+++ b/trunk/drivers/atm/fore200e.c
@@ -178,14 +178,12 @@ fore200e_irq_itoa(int irq)
 
 
 static void*
-fore200e_kmalloc(int size, int flags)
+fore200e_kmalloc(int size, unsigned int __nocast flags)
 {
-    void* chunk = kmalloc(size, flags);
+    void *chunk = kzalloc(size, flags);
 
-    if (chunk)
-	memset(chunk, 0x00, size);
-    else
-	printk(FORE200E "kmalloc() failed, requested size = %d, flags = 0x%x\n", size, flags);
+    if (!chunk)
+	printk(FORE200E "kmalloc() failed, requested size = %d, flags = 0x%x\n",			size, flags);
     
     return chunk;
 }
diff --git a/trunk/include/linux/atmdev.h b/trunk/include/linux/atmdev.h
index 9f374cfa1b05..f1fd849e5535 100644
--- a/trunk/include/linux/atmdev.h
+++ b/trunk/include/linux/atmdev.h
@@ -457,7 +457,7 @@ static inline void atm_dev_put(struct atm_dev *dev)
 
 int atm_charge(struct atm_vcc *vcc,int truesize);
 struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc,int pdu_size,
-    int gfp_flags);
+    unsigned int __nocast gfp_flags);
 int atm_pcr_goal(struct atm_trafprm *tp);
 
 void vcc_release_async(struct atm_vcc *vcc, int reply);
diff --git a/trunk/net/atm/atm_misc.c b/trunk/net/atm/atm_misc.c
index b2113c3454ae..71abc99ec815 100644
--- a/trunk/net/atm/atm_misc.c
+++ b/trunk/net/atm/atm_misc.c
@@ -25,7 +25,7 @@ int atm_charge(struct atm_vcc *vcc,int truesize)
 
 
 struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc,int pdu_size,
-    int gfp_flags)
+    unsigned int __nocast gfp_flags)
 {
 	struct sock *sk = sk_atm(vcc);
 	int guess = atm_guess_pdu2truesize(pdu_size);