Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 1302 → Rev 1303

//kernel/trunk/arch/amd64/src/amd64.c
134,12 → 134,15
{
if (config.cpu_active == 1) {
#ifdef CONFIG_FB
if (vesa_present()) vesa_init();
else
if (vesa_present())
vesa_init();
else
#endif
ega_init(); /* video */
ega_init(); /* video */
/* Enable debugger */
debugger_init();
/* Merge all memory zones to 1 big zone */
zone_merge_all();
}
/* Setup fast SYSCALL/SYSRET */
syscall_setup_cpu();
//kernel/trunk/arch/ia32/src/ia32.c
78,14 → 78,17
if (config.cpu_active == 1) {
 
#ifdef CONFIG_FB
if (vesa_present()) vesa_init();
if (vesa_present())
vesa_init();
else
#endif
ega_init(); /* video */
ega_init(); /* video */
/* Enable debugger */
debugger_init();
/* Merge all memory zones to 1 big zone */
zone_merge_all();
}
}
 
//kernel/trunk/arch/ia32/src/mm/frame.c
133,7 → 133,5
frame_mark_unavailable(0xd000 >> FRAME_WIDTH,3);
#endif
#endif
/* Merge all zones to 1 big zone */
zone_merge_all();
}
}