Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c8f4794 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 33403dcf

drivers/s390/char/sclp_con.c

+2 −3
Original line number Diff line number Diff line
@@ -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);