# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1302322947 -10800
# Node ID 7795225808b3fcf75456d15dc0731bc6e7c15dff
# Parent  387078ef5c0d0abe04b0e8236bd0a606334ea03a
moved enable_intr out of init_intr and after the kernel initialization is completed

diff -r 387078ef5c0d -r 7795225808b3 src/intr.c
--- a/src/intr.c	Sat Apr 09 07:14:06 2011 +0300
+++ b/src/intr.c	Sat Apr 09 07:22:27 2011 +0300
@@ -95,9 +95,6 @@
 	 * setting up the maping of IRQs [0, 15] to interrupts [32, 47]
 	 */
 	init_pic(IRQ_OFFSET);
-
-	/* we're done setting up, enable interrupts before returning */
-	enable_intr();
 }
 
 /* set an interrupt handler function for a particular interrupt */
diff -r 387078ef5c0d -r 7795225808b3 src/main.c
--- a/src/main.c	Sat Apr 09 07:14:06 2011 +0300
+++ b/src/main.c	Sat Apr 09 07:22:27 2011 +0300
@@ -5,6 +5,7 @@
 #include "asmops.h"
 #include "segm.h"
 #include "intr.h"
+#include "mem.h"
 #include "vm.h"
 
 static void do_nothing();
@@ -62,6 +63,9 @@
 	/* initialize paging and the virtual memory manager */
 	init_vm();
 
+	/* initialization complete, enable interrupts */
+	enable_intr();
+
 	dbg_print_vm(MEM_USER);
 	dbg_print_vm(MEM_KERNEL);