summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-07-17 09:49:35 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 20:01:07 +0200
commit6d0fd9c9832005b754d7cd04bc8c0ce7ea035366 (patch)
treea76a35c72fcd7e66934de4dfc1ff0215ee3776b7
parentsparc32 has working dma-mapping only with CONFIG_PCI (diff)
downloadlinux-6d0fd9c9832005b754d7cd04bc8c0ce7ea035366.tar.xz
linux-6d0fd9c9832005b754d7cd04bc8c0ce7ea035366.zip
um_kmalloc() remnants
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>
-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 483aa15222a4..1316456e2a28 100644
--- a/arch/um/drivers/pcap_user.c
+++ b/arch/um/drivers/pcap_user.c
@@ -53,7 +53,7 @@ static int pcap_open(void *data)
return -EIO;
}
- pri->compiled = um_kmalloc(sizeof(struct bpf_program));
+ pri->compiled = kmalloc(sizeof(struct bpf_program), UM_GFP_KERNEL);
if(pri->compiled == NULL){
printk(UM_KERN_ERR "pcap_open : kmalloc failed\n");
return -ENOMEM;