diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-12-06 23:33:16 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:24 -0500 |
commit | 54e6ecb23951b195d02433a741c7f7cb0b796c78 (patch) | |
tree | c8885c49f37c8d383945b8af69d51597494ed62c /drivers/usb/serial | |
parent | f7267c0c0721fd02ad3dc37c3d6dd24ccd81d4d6 (diff) |
[PATCH] slab: remove SLAB_ATOMIC
SLAB_ATOMIC is an alias of GFP_ATOMIC
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/serial')
-rw-r--r-- | drivers/usb/serial/mos7720.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/mos7840.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index 82cd15b894b0..70f93b18292f 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c | |||
@@ -363,7 +363,7 @@ static int mos7720_open(struct usb_serial_port *port, struct file * filp) | |||
363 | 363 | ||
364 | /* Initialising the write urb pool */ | 364 | /* Initialising the write urb pool */ |
365 | for (j = 0; j < NUM_URBS; ++j) { | 365 | for (j = 0; j < NUM_URBS; ++j) { |
366 | urb = usb_alloc_urb(0,SLAB_ATOMIC); | 366 | urb = usb_alloc_urb(0,GFP_ATOMIC); |
367 | mos7720_port->write_urb_pool[j] = urb; | 367 | mos7720_port->write_urb_pool[j] = urb; |
368 | 368 | ||
369 | if (urb == NULL) { | 369 | if (urb == NULL) { |
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index 02c89e10b2cf..5432c6340086 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c | |||
@@ -826,7 +826,7 @@ static int mos7840_open(struct usb_serial_port *port, struct file *filp) | |||
826 | 826 | ||
827 | /* Initialising the write urb pool */ | 827 | /* Initialising the write urb pool */ |
828 | for (j = 0; j < NUM_URBS; ++j) { | 828 | for (j = 0; j < NUM_URBS; ++j) { |
829 | urb = usb_alloc_urb(0, SLAB_ATOMIC); | 829 | urb = usb_alloc_urb(0, GFP_ATOMIC); |
830 | mos7840_port->write_urb_pool[j] = urb; | 830 | mos7840_port->write_urb_pool[j] = urb; |
831 | 831 | ||
832 | if (urb == NULL) { | 832 | if (urb == NULL) { |
@@ -2786,7 +2786,7 @@ static int mos7840_startup(struct usb_serial *serial) | |||
2786 | i + 1, status); | 2786 | i + 1, status); |
2787 | 2787 | ||
2788 | } | 2788 | } |
2789 | mos7840_port->control_urb = usb_alloc_urb(0, SLAB_ATOMIC); | 2789 | mos7840_port->control_urb = usb_alloc_urb(0, GFP_ATOMIC); |
2790 | mos7840_port->ctrl_buf = kmalloc(16, GFP_KERNEL); | 2790 | mos7840_port->ctrl_buf = kmalloc(16, GFP_KERNEL); |
2791 | 2791 | ||
2792 | } | 2792 | } |