[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>

2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/dvb/dvb-usb/usb-urb.c b/drivers/media/dvb/dvb-usb/usb-urb.c
index 78035ee824ca..397f51a7b2ad 100644
--- a/drivers/media/dvb/dvb-usb/usb-urb.c
+++ b/drivers/media/dvb/dvb-usb/usb-urb.c
@@ -116,7 +116,7 @@ static int usb_allocate_stream_buffers(struct usb_data_stream *stream, int num,
         for (stream->buf_num = 0; stream->buf_num < num; stream->buf_num++) {
                 deb_mem("allocating buffer %d\n",stream->buf_num);
                 if (( stream->buf_list[stream->buf_num] =
-                                        usb_buffer_alloc(stream->udev, size, SLAB_ATOMIC,
+                                        usb_buffer_alloc(stream->udev, size, GFP_ATOMIC,
                                         &stream->dma_addr[stream->buf_num]) ) == NULL) {
                         deb_mem("not enough memory for urb-buffer allocation.\n");
                         usb_free_stream_buffers(stream);
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index 8135f3e76aeb..10b121ada833 100644
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -1244,7 +1244,7 @@ static int ttusb_dec_init_usb(struct ttusb_dec *dec)
                         return -ENOMEM;
                 }
                 dec->irq_buffer = usb_buffer_alloc(dec->udev,IRQ_PACKET_SIZE,
-                                        SLAB_ATOMIC, &dec->irq_dma_handle);
+                                        GFP_ATOMIC, &dec->irq_dma_handle);
                 if(!dec->irq_buffer) {
                         return -ENOMEM;
                 }