Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-2.6-microblaze.git] / drivers / scsi / st.c

diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index a427ce9..c9e27e7 100644 (file)
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -3878,7 +3878,7 @@ static struct st_buffer *new_tape_buffer(int need_dma, int max_sg)
 {
        struct st_buffer *tb;
 
-       tb = kzalloc(sizeof(struct st_buffer), GFP_ATOMIC);
+       tb = kzalloc(sizeof(struct st_buffer), GFP_KERNEL);
        if (!tb) {
                printk(KERN_NOTICE "st: Can't allocate new tape buffer.\n");
                return NULL;
@@ -3889,7 +3889,7 @@ static struct st_buffer *new_tape_buffer(int need_dma, int max_sg)
        tb->buffer_size = 0;
 
        tb->reserved_pages = kzalloc(max_sg * sizeof(struct page *),
-                                    GFP_ATOMIC);
+                                    GFP_KERNEL);
        if (!tb->reserved_pages) {
                kfree(tb);
                return NULL;
@@ -4290,7 +4290,7 @@ static int st_probe(struct device *dev)
                goto out_buffer_free;
        }
 
-       tpnt = kzalloc(sizeof(struct scsi_tape), GFP_ATOMIC);
+       tpnt = kzalloc(sizeof(struct scsi_tape), GFP_KERNEL);
        if (tpnt == NULL) {
                sdev_printk(KERN_ERR, SDp,
                            "st: Can't allocate device descriptor.\n");