summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAl Viro2008-05-21 07:32:11 +0200
committerLinus Torvalds2008-05-22 01:55:57 +0200
commit296cd66f7f6e130fe08e6880ecb13c3fc615a8db (patch)
tree805b25dcc413b4adb74b7336d0d4fcfe9e89ec23 /arch
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff)
downloadkernel-qcow2-linux-296cd66f7f6e130fe08e6880ecb13c3fc615a8db.tar.gz
kernel-qcow2-linux-296cd66f7f6e130fe08e6880ecb13c3fc615a8db.tar.xz
kernel-qcow2-linux-296cd66f7f6e130fe08e6880ecb13c3fc615a8db.zip
missed kmalloc() in pcap_user.c
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Acked-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/um/drivers/pcap_user.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/pcap_user.c b/arch/um/drivers/pcap_user.c
index e9809356c530..5f903587d69e 100644
--- 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");