From eac40b07eec02c80fa34598564827b9318875dd1 Mon Sep 17 00:00:00 2001 From: Victor Fusco Date: Tue, 19 Jul 2005 13:56:01 -0700 Subject: [PATCH] --- yaml --- r: 4916 b: refs/heads/master c: c9e42614585dddd544a56907ff5fd5ca55411967 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/atm/firestream.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c212a283db73..6664f362acec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e8676d113a097e19d18492e85215f0f3cc86e43 +refs/heads/master: c9e42614585dddd544a56907ff5fd5ca55411967 diff --git a/trunk/drivers/atm/firestream.c b/trunk/drivers/atm/firestream.c index 101f0cc33d10..b078fa548ebf 100644 --- a/trunk/drivers/atm/firestream.c +++ b/trunk/drivers/atm/firestream.c @@ -1374,7 +1374,8 @@ static void reset_chip (struct fs_dev *dev) } } -static void __devinit *aligned_kmalloc (int size, int flags, int alignment) +static void __devinit *aligned_kmalloc (int size, unsigned int __nocast flags, + int alignment) { void *t; @@ -1464,7 +1465,8 @@ static inline int nr_buffers_in_freepool (struct fs_dev *dev, struct freepool *f does. I've seen "receive abort: no buffers" and things started working again after that... -- REW */ -static void top_off_fp (struct fs_dev *dev, struct freepool *fp, int gfp_flags) +static void top_off_fp (struct fs_dev *dev, struct freepool *fp, + unsigned int __nocast gfp_flags) { struct FS_BPENTRY *qe, *ne; struct sk_buff *skb;