|
@@ -95,7 +95,6 @@
|
|
#include <linux/timer.h>
|
|
#include <linux/timer.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/workqueue.h>
|
|
#include <linux/workqueue.h>
|
|
-#include <linux/bootmem.h>
|
|
|
|
#include <linux/pm.h>
|
|
#include <linux/pm.h>
|
|
#include <linux/font.h>
|
|
#include <linux/font.h>
|
|
#include <linux/bitops.h>
|
|
#include <linux/bitops.h>
|
|
@@ -2875,14 +2874,11 @@ static int __init con_init(void)
|
|
mod_timer(&console_timer, jiffies + blankinterval);
|
|
mod_timer(&console_timer, jiffies + blankinterval);
|
|
}
|
|
}
|
|
|
|
|
|
- /*
|
|
|
|
- * kmalloc is not running yet - we use the bootmem allocator.
|
|
|
|
- */
|
|
|
|
for (currcons = 0; currcons < MIN_NR_CONSOLES; currcons++) {
|
|
for (currcons = 0; currcons < MIN_NR_CONSOLES; currcons++) {
|
|
- vc_cons[currcons].d = vc = alloc_bootmem(sizeof(struct vc_data));
|
|
|
|
|
|
+ vc_cons[currcons].d = vc = kzalloc(sizeof(struct vc_data), GFP_NOWAIT);
|
|
INIT_WORK(&vc_cons[currcons].SAK_work, vc_SAK);
|
|
INIT_WORK(&vc_cons[currcons].SAK_work, vc_SAK);
|
|
visual_init(vc, currcons, 1);
|
|
visual_init(vc, currcons, 1);
|
|
- vc->vc_screenbuf = (unsigned short *)alloc_bootmem(vc->vc_screenbuf_size);
|
|
|
|
|
|
+ vc->vc_screenbuf = kzalloc(vc->vc_screenbuf_size, GFP_NOWAIT);
|
|
vc->vc_kmalloced = 0;
|
|
vc->vc_kmalloced = 0;
|
|
vc_init(vc, vc->vc_rows, vc->vc_cols,
|
|
vc_init(vc, vc->vc_rows, vc->vc_cols,
|
|
currcons || !vc->vc_sw->con_save_screen);
|
|
currcons || !vc->vc_sw->con_save_screen);
|