X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/247ffdeea41720d829b9e0acc7887c5869924f56..ed22a6995cddb7b61503fdca859267ef85b3bdd3:/aseg-paging/pagingstub.c?ds=sidebyside

diff --git a/aseg-paging/pagingstub.c b/aseg-paging/pagingstub.c
index d839966..0115713 100644
--- 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 "traps.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);
+
 	if (!entry_initialized) {
 		
 		/* If needed, copy in data. */
@@ -123,6 +125,11 @@ void c_entry(void)
 			*bp = 0;
 		serial_init();
 		dolog("Paging enabled.");
+	}
+
+	traps_install();
+
+	if (!entry_initialized) {
 		smi_init();
 		
 		entry_initialized = 1;