diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2009-06-22 06:08:06 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-06-22 06:08:17 -0400 |
commit | 4c8f4794b61e89dd68f96cfc23a9d9b6c25be420 (patch) | |
tree | 6cd25c6216df5661e897ff172a30e2975b47e29f | |
parent | 33403dcfcdfd097d80213a715604eab2dca93b2e (diff) |
[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>
-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 @@ | |||
11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
12 | #include <linux/timer.h> | 12 | #include <linux/timer.h> |
13 | #include <linux/jiffies.h> | 13 | #include <linux/jiffies.h> |
14 | #include <linux/bootmem.h> | ||
15 | #include <linux/termios.h> | 14 | #include <linux/termios.h> |
16 | #include <linux/err.h> | 15 | #include <linux/err.h> |
17 | #include <linux/reboot.h> | 16 | #include <linux/reboot.h> |
@@ -298,8 +297,8 @@ sclp_console_init(void) | |||
298 | /* Allocate pages for output buffering */ | 297 | /* Allocate pages for output buffering */ |
299 | INIT_LIST_HEAD(&sclp_con_pages); | 298 | INIT_LIST_HEAD(&sclp_con_pages); |
300 | for (i = 0; i < MAX_CONSOLE_PAGES; i++) { | 299 | for (i = 0; i < MAX_CONSOLE_PAGES; i++) { |
301 | page = alloc_bootmem_low_pages(PAGE_SIZE); | 300 | page = (void *) get_zeroed_page(GFP_KERNEL | GFP_DMA); |
302 | list_add_tail((struct list_head *) page, &sclp_con_pages); | 301 | list_add_tail(page, &sclp_con_pages); |
303 | } | 302 | } |
304 | INIT_LIST_HEAD(&sclp_con_outqueue); | 303 | INIT_LIST_HEAD(&sclp_con_outqueue); |
305 | spin_lock_init(&sclp_con_lock); | 304 | spin_lock_init(&sclp_con_lock); |