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/input/usbmouse.c | |
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/input/usbmouse.c')
-rw-r--r-- | drivers/usb/input/usbmouse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/input/usbmouse.c b/drivers/usb/input/usbmouse.c index 68a55642c082..64a33e420cfb 100644 --- a/drivers/usb/input/usbmouse.c +++ b/drivers/usb/input/usbmouse.c | |||
@@ -86,7 +86,7 @@ static void usb_mouse_irq(struct urb *urb) | |||
86 | 86 | ||
87 | input_sync(dev); | 87 | input_sync(dev); |
88 | resubmit: | 88 | resubmit: |
89 | status = usb_submit_urb (urb, SLAB_ATOMIC); | 89 | status = usb_submit_urb (urb, GFP_ATOMIC); |
90 | if (status) | 90 | if (status) |
91 | err ("can't resubmit intr, %s-%s/input0, status %d", | 91 | err ("can't resubmit intr, %s-%s/input0, status %d", |
92 | mouse->usbdev->bus->bus_name, | 92 | mouse->usbdev->bus->bus_name, |
@@ -137,7 +137,7 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i | |||
137 | if (!mouse || !input_dev) | 137 | if (!mouse || !input_dev) |
138 | goto fail1; | 138 | goto fail1; |
139 | 139 | ||
140 | mouse->data = usb_buffer_alloc(dev, 8, SLAB_ATOMIC, &mouse->data_dma); | 140 | mouse->data = usb_buffer_alloc(dev, 8, GFP_ATOMIC, &mouse->data_dma); |
141 | if (!mouse->data) | 141 | if (!mouse->data) |
142 | goto fail1; | 142 | goto fail1; |
143 | 143 | ||