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

Commit 5c0792f6 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] vt220 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 4c8f4794

drivers/s390/char/sclp_vt220.c

+5 −13
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <linux/major.h>

#include <linux/console.h>

#include <linux/kdev_t.h>

#include <linux/bootmem.h>

#include <linux/interrupt.h>

#include <linux/init.h>

#include <linux/reboot.h>
@@ -601,10 +600,7 @@ static void __init __sclp_vt220_free_pages(void) 


	list_for_each_safe(page, p, &sclp_vt220_empty) {

		list_del(page);

		if (slab_is_available())

		free_page((unsigned long) page);

		else

			free_bootmem((unsigned long) page, PAGE_SIZE);

	}

}
@@ -640,16 +636,12 @@ static int __init __sclp_vt220_init(int num_pages) 
	sclp_vt220_flush_later = 0;



	/* Allocate pages for output buffering */

	rc = -ENOMEM;

	for (i = 0; i < num_pages; i++) {

		if (slab_is_available())

		page = (void *) get_zeroed_page(GFP_KERNEL | GFP_DMA);

		else

			page = alloc_bootmem_low_pages(PAGE_SIZE);

		if (!page) {

			rc = -ENOMEM;

		if (!page)

			goto out;

		}

		list_add_tail((struct list_head *) page, &sclp_vt220_empty);

		list_add_tail(page, &sclp_vt220_empty);

	}

	rc = sclp_register(&sclp_vt220_register);

out: