Smashed some dumb bugs

aargh

2 files changed, 9 insertions, 7 deletions

diff --git a/kernel/drivers/cpu.c b/kernel/drivers/cpu.c
index 44091a3..93c2cf3 100644
--- a/kernel/drivers/cpu.c
+++ b/kernel/drivers/cpu.c
@@ -156,6 +156,9 @@ CLEAR void cpu_enable_features(void)
 	cpu_extended_information = cpuid(0x80000001);
 	cpu_extended_features = cpuid(0x7);
 
+	// Enable NMI
+	outb(0x70, inb(0x70) & 0x7F);
+
 	// Enable SSE
 	if (cpu_features.edx & CPUID_FEAT_EDX_SSE) {
 		__asm__ volatile("clts");
@@ -201,11 +204,11 @@ CLEAR void cpu_enable_features(void)
 	}
 
 	// Enable UMIP // TODO: QEMU support?!
-	if (cpu_extended_features.ecx & CPUID_EXT_FEAT_ECX_UMIP) {
-		cr4_set(cr4_get() | 0x800);
-	} else {
-		print("No UMIP support :(\n");
-	}
+	/* if (cpu_extended_features.ecx & CPUID_EXT_FEAT_ECX_UMIP) { */
+	/* 	cr4_set(cr4_get() | 0x800); */
+	/* } else { */
+	/* 	print("No UMIP support :(\n"); */
+	/* } */
 }
 
 /**
diff --git a/kernel/drivers/int.c b/kernel/drivers/int.c
index 47a2699..39462fa 100644
--- a/kernel/drivers/int.c
+++ b/kernel/drivers/int.c
@@ -109,8 +109,8 @@ static void int_trap_handler(struct int_frame *frame)
 		       frame->eip, frame->eip - proc->entry);
 		printf("\t\t-> Process: [entry: %x, kstack: %x, esp %x, ustack: %x]\n", proc->entry,
 		       proc->stack.kernel, frame->esp, proc->stack.user);
-		proc_exit(proc, 1);
 		faulting--;
+		proc_exit(proc, 1);
 	} else {
 		while (1)
 			__asm__ volatile("cli\nhlt");
@@ -129,7 +129,6 @@ CLEAR void int_event_handler_add(u32 int_no, void (*handler)(void))
 	int_event_handlers[int_no] = handler;
 }
 
-#include <mm.h>
 static u32 int_event_handler(struct int_frame *frame)
 {
 	u32 int_no = frame->int_no - 32;