git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[sfrench/cifs-2.6.git]
/
arch
/
um
/
drivers
/
pcap_user.c
diff --git
a/arch/um/drivers/pcap_user.c
b/arch/um/drivers/pcap_user.c
index e9809356c5305408e702a70e43bb8652d193c8b9..5f903587d69e4ae322672270c0bba17d2ec41295 100644
(file)
--- a/
arch/um/drivers/pcap_user.c
+++ b/
arch/um/drivers/pcap_user.c
@@
-50,7
+50,7
@@
static int pcap_open(void *data)
return -EIO;
}
- pri->compiled = kmalloc(sizeof(struct bpf_program),
+ pri->compiled =
uml_
kmalloc(sizeof(struct bpf_program),
UM_GFP_KERNEL);
if (pri->compiled == NULL) {
printk(UM_KERN_ERR "pcap_open : kmalloc failed\n");