add some fault handlers

[netwatch.git] / aseg-paging / pagingstub.c

diff --git a/aseg-paging/pagingstub.c b/aseg-paging/pagingstub.c
index d839966749dbb8dd919f897df80dcda5ac129471..0115713bf93d29e4e990243aade030bb27a22a36 100644 (file)
--- a/aseg-paging/pagingstub.c
+++ b/aseg-paging/pagingstub.c
@@ -5,6 +5,7 @@
 #include <smi.h>
 #include <pci-bother.h>
 #include <serial.h>
 #include <smi.h>
 #include <pci-bother.h>
 #include <serial.h>

+#include "traps.h"

 #include "../net/net.h"
 #include "vga-overlay.h"
 
 #include "../net/net.h"
 #include "vga-overlay.h"
 


@@ -114,6 +115,7 @@ void c_entry(void)
        set_cr0(get_cr0() | CR0_PG);
        
        outb(0x80, 0x43);
        set_cr0(get_cr0() | CR0_PG);
        
        outb(0x80, 0x43);

+

        if (!entry_initialized) {
                
                /* If needed, copy in data. */
        if (!entry_initialized) {
                
                /* If needed, copy in data. */


@@ -123,6 +125,11 @@ void c_entry(void)
                        *bp = 0;
                serial_init();
                dolog("Paging enabled.");
                        *bp = 0;
                serial_init();
                dolog("Paging enabled.");

+       }
+
+       traps_install();
+
+       if (!entry_initialized) {

                smi_init();
                
                entry_initialized = 1;
                smi_init();
                
                entry_initialized = 1;