diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-06-11 12:25:37 -0400 |
---|---|---|
committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-06-11 12:33:34 -0400 |
commit | b8ec757390282e21d349bf6b602a8cb182da0429 (patch) | |
tree | 3736f817a4433be6d2b309288e25fbb82d9c6c88 /drivers/video/console | |
parent | 22fb4e71e646695c7e0f379ada66b372c2d1aa1a (diff) |
vgacon: use slab allocator instead of the bootmem allocator
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>
Diffstat (limited to 'drivers/video/console')
-rw-r--r-- | drivers/video/console/vgacon.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c index 38e86b84dce0..59d7d5ec17a4 100644 --- a/drivers/video/console/vgacon.c +++ b/drivers/video/console/vgacon.c | |||
@@ -180,7 +180,7 @@ static inline void vga_set_mem_top(struct vc_data *c) | |||
180 | } | 180 | } |
181 | 181 | ||
182 | #ifdef CONFIG_VGACON_SOFT_SCROLLBACK | 182 | #ifdef CONFIG_VGACON_SOFT_SCROLLBACK |
183 | #include <linux/bootmem.h> | 183 | #include <linux/slab.h> |
184 | /* software scrollback */ | 184 | /* software scrollback */ |
185 | static void *vgacon_scrollback; | 185 | static void *vgacon_scrollback; |
186 | static int vgacon_scrollback_tail; | 186 | static int vgacon_scrollback_tail; |
@@ -210,8 +210,7 @@ static void vgacon_scrollback_init(int pitch) | |||
210 | */ | 210 | */ |
211 | static void __init_refok vgacon_scrollback_startup(void) | 211 | static void __init_refok vgacon_scrollback_startup(void) |
212 | { | 212 | { |
213 | vgacon_scrollback = alloc_bootmem(CONFIG_VGACON_SOFT_SCROLLBACK_SIZE | 213 | vgacon_scrollback = kcalloc(CONFIG_VGACON_SOFT_SCROLLBACK_SIZE, 1024, GFP_NOWAIT); |
214 | * 1024); | ||
215 | vgacon_scrollback_init(vga_video_num_columns * 2); | 214 | vgacon_scrollback_init(vga_video_num_columns * 2); |
216 | } | 215 | } |
217 | 216 | ||