Subversion Repositories HelenOS-historic

Rev

Rev 242 | Rev 252 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 242 Rev 251
Line 37... Line 37...
37
#include <arch/i8254.h>
37
#include <arch/i8254.h>
38
#include <arch/i8259.h>
38
#include <arch/i8259.h>
39
 
39
 
40
#include <arch/bios/bios.h>
40
#include <arch/bios/bios.h>
41
#include <arch/mm/memory_init.h>
41
#include <arch/mm/memory_init.h>
-
 
42
#include <arch/cpu.h>
-
 
43
#include <print.h>
-
 
44
#include <arch/cpuid.h>
42
 
45
 
43
void arch_pre_mm_init(void)
46
void arch_pre_mm_init(void)
44
{
47
{
-
 
48
    struct cpu_info cpuid_s;
-
 
49
 
-
 
50
    cpuid(AMD_CPUID_EXTENDED,&cpuid_s);
-
 
51
    if (! (cpuid_s.cpuid_edx & (1<<AMD_EXT_NOEXECUTE))) {
-
 
52
        printf("We do not support NX!!-----------\n");
-
 
53
        printf("%X------\n",cpuid_s.cpuid_edx);
-
 
54
        cpu_halt();
-
 
55
    }
-
 
56
    set_efer_flag(AMD_NXE_FLAG);
-
 
57
 
45
    pm_init();
58
    pm_init();
46
 
59
 
47
    if (config.cpu_active == 1) {
60
    if (config.cpu_active == 1) {
48
        bios_init();
61
        bios_init();
49
        i8042_init();   /* a20 bit */
62
        i8042_init();   /* a20 bit */