diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-12-06 23:33:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:24 -0500 |
commit | e94b1766097d53e6f3ccfb36c8baa562ffeda3fc (patch) | |
tree | 93fa0a8ab84976d4e89c50768ca8b8878d642a0d /drivers/usb/gadget/inode.c | |
parent | 54e6ecb23951b195d02433a741c7f7cb0b796c78 (diff) |
[PATCH] slab: remove SLAB_KERNEL
SLAB_KERNEL is an alias of GFP_KERNEL.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/usb/gadget/inode.c')
-rw-r--r-- | drivers/usb/gadget/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c index 86924f9cdd7e..3fb1044a4db0 100644 --- a/drivers/usb/gadget/inode.c +++ b/drivers/usb/gadget/inode.c | |||
@@ -412,7 +412,7 @@ ep_read (struct file *fd, char __user *buf, size_t len, loff_t *ptr) | |||
412 | /* FIXME readahead for O_NONBLOCK and poll(); careful with ZLPs */ | 412 | /* FIXME readahead for O_NONBLOCK and poll(); careful with ZLPs */ |
413 | 413 | ||
414 | value = -ENOMEM; | 414 | value = -ENOMEM; |
415 | kbuf = kmalloc (len, SLAB_KERNEL); | 415 | kbuf = kmalloc (len, GFP_KERNEL); |
416 | if (unlikely (!kbuf)) | 416 | if (unlikely (!kbuf)) |
417 | goto free1; | 417 | goto free1; |
418 | 418 | ||
@@ -456,7 +456,7 @@ ep_write (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) | |||
456 | /* FIXME writebehind for O_NONBLOCK and poll(), qlen = 1 */ | 456 | /* FIXME writebehind for O_NONBLOCK and poll(), qlen = 1 */ |
457 | 457 | ||
458 | value = -ENOMEM; | 458 | value = -ENOMEM; |
459 | kbuf = kmalloc (len, SLAB_KERNEL); | 459 | kbuf = kmalloc (len, GFP_KERNEL); |
460 | if (!kbuf) | 460 | if (!kbuf) |
461 | goto free1; | 461 | goto free1; |
462 | if (copy_from_user (kbuf, buf, len)) { | 462 | if (copy_from_user (kbuf, buf, len)) { |
@@ -1898,7 +1898,7 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) | |||
1898 | buf += 4; | 1898 | buf += 4; |
1899 | length -= 4; | 1899 | length -= 4; |
1900 | 1900 | ||
1901 | kbuf = kmalloc (length, SLAB_KERNEL); | 1901 | kbuf = kmalloc (length, GFP_KERNEL); |
1902 | if (!kbuf) | 1902 | if (!kbuf) |
1903 | return -ENOMEM; | 1903 | return -ENOMEM; |
1904 | if (copy_from_user (kbuf, buf, length)) { | 1904 | if (copy_from_user (kbuf, buf, length)) { |