[S390] sclp console: convert from bootmem to slab
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Mon, 22 Jun 2009 10:08:06 +0000 (12:08 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Mon, 22 Jun 2009 10:08:17 +0000 (12:08 +0200)
The slab allocator is earlier available so convert the
bootmem allocations to slab/gfp allocations.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
drivers/s390/char/sclp_con.c

index 336811a77672c751f9a8ab3f74281dd52f068f38..fb54e7e47e59a80e0a97eb8779fcb73ecfc872e1 100644 (file)
@@ -11,7 +11,6 @@
 #include <linux/init.h>
 #include <linux/timer.h>
 #include <linux/jiffies.h>
-#include <linux/bootmem.h>
 #include <linux/termios.h>
 #include <linux/err.h>
 #include <linux/reboot.h>
@@ -298,8 +297,8 @@ sclp_console_init(void)
        /* Allocate pages for output buffering */
        INIT_LIST_HEAD(&sclp_con_pages);
        for (i = 0; i < MAX_CONSOLE_PAGES; i++) {
-               page = alloc_bootmem_low_pages(PAGE_SIZE);
-               list_add_tail((struct list_head *) page, &sclp_con_pages);
+               page = (void *) get_zeroed_page(GFP_KERNEL | GFP_DMA);
+               list_add_tail(page, &sclp_con_pages);
        }
        INIT_LIST_HEAD(&sclp_con_outqueue);
        spin_lock_init(&sclp_con_lock);