projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] gfp flags annotations - part 1
[powerpc.git]
/
drivers
/
atm
/
fore200e.c
diff --git
a/drivers/atm/fore200e.c
b/drivers/atm/fore200e.c
index
5f70219
..
14f6a62
100644
(file)
--- a/
drivers/atm/fore200e.c
+++ b/
drivers/atm/fore200e.c
@@
-178,14
+178,12
@@
fore200e_irq_itoa(int irq)
static void*
static void*
-fore200e_kmalloc(int size,
in
t flags)
+fore200e_kmalloc(int size,
gfp_
t flags)
{
{
- void
* chunk = km
alloc(size, flags);
+ void
*chunk = kz
alloc(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;
}
return chunk;
}
@@
-1176,7
+1174,7
@@
fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
return -ENOMEM;
}
return -ENOMEM;
}
-
do_gettimeofday(&skb->stamp
);
+
__net_timestamp(skb
);
#ifdef FORE200E_52BYTE_AAL0_SDU
if (cell_header) {
#ifdef FORE200E_52BYTE_AAL0_SDU
if (cell_header) {