evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vgacon: use slab allocator instead of the bootmem allocator

Browse source 
Slab is initialized before the console subsystem so use the slab allocator in
vgacon_scrollback_startup().

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
This commit is contained in:
Pekka Enberg 2009-06-11 19:25:37 +03:00
parent 22fb4e71e6
commit b8ec757390
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/video/console/vgacon.c
View file

@ -180,7 +180,7 @@ static inline void vga_set_mem_top(struct vc_data *c)
} }
#ifdef CONFIG_VGACON_SOFT_SCROLLBACK #ifdef CONFIG_VGACON_SOFT_SCROLLBACK
#include <linux/bootmem.h> #include <linux/slab.h>
/* software scrollback */ /* software scrollback */
static void *vgacon_scrollback; static void *vgacon_scrollback;
static int vgacon_scrollback_tail; static int vgacon_scrollback_tail;
@ -210,8 +210,7 @@ static void vgacon_scrollback_init(int pitch)
*/ */
static void __init_refok vgacon_scrollback_startup(void) static void __init_refok vgacon_scrollback_startup(void)
{ {
vgacon_scrollback = alloc_bootmem(CONFIG_VGACON_SOFT_SCROLLBACK_SIZE vgacon_scrollback = kcalloc(CONFIG_VGACON_SOFT_SCROLLBACK_SIZE, 1024, GFP_NOWAIT);
* 1024);
vgacon_scrollback_init(vga_video_num_columns * 2); vgacon_scrollback_init(vga_video_num_columns * 2);
} }