diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2009-06-22 12:08:06 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-06-22 12:08:17 +0200 |
| commit | 4c8f4794b61e89dd68f96cfc23a9d9b6c25be420 (patch) | |
| tree | 6cd25c6216df5661e897ff172a30e2975b47e29f /drivers/s390 | |
| parent | 33403dcfcdfd097d80213a715604eab2dca93b2e (diff) | |
| download | linux-4c8f4794b61e89dd68f96cfc23a9d9b6c25be420.tar.gz linux-4c8f4794b61e89dd68f96cfc23a9d9b6c25be420.tar.bz2 linux-4c8f4794b61e89dd68f96cfc23a9d9b6c25be420.zip | |
[S390] sclp console: convert from bootmem to slab
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>
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/char/sclp_con.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/s390/char/sclp_con.c b/drivers/s390/char/sclp_con.c index 336811a77672..fb54e7e47e59 100644 --- a/drivers/s390/char/sclp_con.c +++ b/drivers/s390/char/sclp_con.c @@ -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); |