aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-07-17 08:49:35 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 11:01:07 -0700
commit6d0fd9c9832005b754d7cd04bc8c0ce7ea035366 (patch)
treea76a35c72fcd7e66934de4dfc1ff0215ee3776b7 /arch
parent7155c9f576fc8cff12448110b5d104096ba58aee (diff)
downloadkernel_samsung_aries-6d0fd9c9832005b754d7cd04bc8c0ce7ea035366.zip
kernel_samsung_aries-6d0fd9c9832005b754d7cd04bc8c0ce7ea035366.tar.gz
kernel_samsung_aries-6d0fd9c9832005b754d7cd04bc8c0ce7ea035366.tar.bz2
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>
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 483aa15..1316456 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;