Author: sls Date: Fri Feb 23 06:49:06 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- s/SLAB_ATOMIC/GFP_ATOMIC/
---- Files affected:
SOURCES:
lirc-kernel-2.6.20.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/lirc-kernel-2.6.20.patch
diff -u /dev/null SOURCES/lirc-kernel-2.6.20.patch:1.1
--- /dev/null Fri Feb 23 07:49:06 2007
+++ SOURCES/lirc-kernel-2.6.20.patch Fri Feb 23 07:49:01 2007
@@ -0,0 +1,145 @@
+--- lirc-0.8.1/drivers/lirc_atiusb/lirc_atiusb.c.orig 2007-02-22
23:47:11.000000000 +0000
++++ lirc-0.8.1/drivers/lirc_atiusb/lirc_atiusb.c 2007-02-22
23:49:08.000000000 +0000
+@@ -255,7 +255,7 @@
+ add_wait_queue(&oep->wait, &wait);
+
+ #ifdef KERNEL_2_5
+- if (usb_submit_urb(oep->urb, SLAB_ATOMIC)) {
++ if (usb_submit_urb(oep->urb, GFP_ATOMIC)) {
+ #else
+ if (usb_submit_urb(oep->urb)) {
+ #endif
+@@ -327,7 +327,7 @@
+ iep->urb->dev = ir->usbdev;
+ dprintk(DRIVER_NAME "[%d]: linking iep 0x%02x (%p)\n",
ir->devnum, iep->ep->bEndpointAddress, iep);
+ #ifdef KERNEL_2_5
+- if ((rtn = usb_submit_urb(iep->urb, SLAB_ATOMIC)) < 0) {
++ if ((rtn = usb_submit_urb(iep->urb, GFP_ATOMIC)) < 0) {
+ #else
+ if ((rtn = usb_submit_urb(iep->urb)) < 0) {
+ #endif
+@@ -663,7 +663,7 @@
+
+ /* resubmit urb */
+ #ifdef KERNEL_2_5
+- usb_submit_urb(urb, SLAB_ATOMIC);
++ usb_submit_urb(urb, GFP_ATOMIC);
+ #endif
+ }
+
+@@ -779,7 +779,7 @@
+ iep->len = len;
+
+ #ifdef KERNEL_2_5
+- if ( !(iep->buf = usb_buffer_alloc(dev, len, SLAB_ATOMIC,
&iep->dma)) ) {
++ if ( !(iep->buf = usb_buffer_alloc(dev, len, GFP_ATOMIC,
&iep->dma)) ) {
+ mem_failure = 2;
+ } else if ( !(iep->urb = usb_alloc_urb(0, GFP_KERNEL)) ) {
+ mem_failure = 3;
+@@ -860,7 +860,7 @@
+ init_waitqueue_head(&oep->wait);
+
+ #ifdef KERNEL_2_5
+- if ( !(oep->buf = usb_buffer_alloc(dev, USB_OUTLEN,
SLAB_ATOMIC, &oep->dma)) ) {
++ if ( !(oep->buf = usb_buffer_alloc(dev, USB_OUTLEN, GFP_ATOMIC,
&oep->dma)) ) {
+ mem_failure = 2;
+ } else if ( !(oep->urb = usb_alloc_urb(0, GFP_KERNEL)) ) {
+ mem_failure = 3;
+--- lirc-0.8.1/drivers/lirc_mceusb/lirc_mceusb.c.orig 2007-02-22
23:50:14.000000000 +0000
++++ lirc-0.8.1/drivers/lirc_mceusb/lirc_mceusb.c 2007-02-22
23:50:49.000000000 +0000
+@@ -772,7 +772,7 @@
+ dev->bulk_in_endpointAddr = endpoint->bEndpointAddress;
+ #ifdef KERNEL_2_5
+ dev->bulk_in_buffer = usb_buffer_alloc
+- (udev, buffer_size, SLAB_ATOMIC, &dev->dma_in);
++ (udev, buffer_size, GFP_ATOMIC, &dev->dma_in);
+ #else
+ dev->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
+ #endif
+@@ -799,7 +799,7 @@
+ dev->bulk_out_size = buffer_size;
+ dev->bulk_out_endpointAddr = endpoint->bEndpointAddress;
+ #ifdef KERNEL_2_5
+- dev->bulk_out_buffer = usb_buffer_alloc(udev,
buffer_size, SLAB_ATOMIC, &dev->dma_out);
++ dev->bulk_out_buffer = usb_buffer_alloc(udev,
buffer_size, GFP_ATOMIC, &dev->dma_out);
+ #else
+ dev->bulk_out_buffer = kmalloc (buffer_size,
GFP_KERNEL);
+ #endif
+--- lirc-0.8.1/drivers/lirc_mceusb2/lirc_mceusb2.c.orig 2007-02-22
23:51:19.000000000 +0000
++++ lirc-0.8.1/drivers/lirc_mceusb2/lirc_mceusb2.c 2007-02-22
23:51:38.000000000 +0000
+@@ -263,7 +263,7 @@
+ async_urb->transfer_buffer_length = size;
+ async_urb->dev = ir->usbdev;
+
+- if ((res=usb_submit_urb(async_urb, SLAB_ATOMIC))) {
++ if ((res=usb_submit_urb(async_urb, GFP_ATOMIC))) {
+ dprintk(DRIVER_NAME "[%d]: receive request FAILED! (res=%d)\n",
ir->devnum, res);
+ return;
+ }
+@@ -466,7 +466,7 @@
+ }
+
+ /* resubmit urb */
+- usb_submit_urb(urb, SLAB_ATOMIC);
++ usb_submit_urb(urb, GFP_ATOMIC);
+ }
+
+
+@@ -702,7 +702,7 @@
+ mem_failure = 3;
+ } else if (lirc_buffer_init(rbuf, sizeof(lirc_t),
LIRCBUF_SIZE)) {
+ mem_failure = 4;
+- } else if (!(ir->buf_in = usb_buffer_alloc(dev, maxp,
SLAB_ATOMIC, &ir->dma_in))) {
++ } else if (!(ir->buf_in = usb_buffer_alloc(dev, maxp,
GFP_ATOMIC, &ir->dma_in))) {
+ mem_failure = 5;
+ } else if (!(ir->urb_in = usb_alloc_urb(0, GFP_KERNEL))) {
+ mem_failure = 7;
+--- lirc-0.8.1/drivers/lirc_igorplugusb/lirc_igorplugusb.c.orig
2007-02-22 23:52:11.000000000 +0000
++++ lirc-0.8.1/drivers/lirc_igorplugusb/lirc_igorplugusb.c 2007-02-22
23:52:27.000000000 +0000
+@@ -488,7 +488,7 @@
+ #if defined(KERNEL_2_5)
+ } else if (!(ir->buf_in = usb_buffer_alloc(dev,
+ DEVICE_BUFLEN+DEVICE_HEADERLEN,
+- SLAB_ATOMIC, &ir->dma_in))) {
++ GFP_ATOMIC, &ir->dma_in))) {
+ mem_failure = 5;
+ #else
+ } else if (!(ir->buf_in = kmalloc(
+--- lirc-0.8.1/drivers/lirc_streamzap/lirc_streamzap.c.orig 2007-02-23
00:13:46.000000000 +0000
++++ lirc-0.8.1/drivers/lirc_streamzap/lirc_streamzap.c 2007-02-23
00:14:24.000000000 +0000
+@@ -458,7 +458,7 @@
+
+ #ifdef KERNEL_2_5
+ /* resubmit only for 2.6 */
+- usb_submit_urb( urb, SLAB_ATOMIC );
++ usb_submit_urb( urb, GFP_ATOMIC );
+ #endif
+
+ return;
+@@ -556,7 +556,7 @@
+ sz->buf_in_len = sz->endpoint->wMaxPacketSize;
+ #ifdef KERNEL_2_5
+ if((sz->buf_in = usb_buffer_alloc(sz->udev, sz->buf_in_len,
+- SLAB_ATOMIC, &sz->dma_in)) == NULL )
++ GFP_ATOMIC, &sz->dma_in)) == NULL )
+ {
+ goto error;
+ }
+@@ -715,7 +715,7 @@
+
+ sz->urb_in->dev = sz->udev;
+ #ifdef KERNEL_2_5
+- if (usb_submit_urb(sz->urb_in, SLAB_ATOMIC))
++ if (usb_submit_urb(sz->urb_in, GFP_ATOMIC))
+ #else
+ if (usb_submit_urb(sz->urb_in))
+ #endif
+@@ -866,7 +866,7 @@
+
+ sz->urb_in->dev = sz->udev;
+ #ifdef KERNEL_2_5
+- if (usb_submit_urb(sz->urb_in, SLAB_ATOMIC))
++ if (usb_submit_urb(sz->urb_in, GFP_ATOMIC))
+ #else
+ if (usb_submit_urb(sz->urb_in))
+ #endif
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
