From: Jacob Potter <jdpotter@andrew.cmu.edu>
Date: Fri, 7 Nov 2008 20:17:10 +0000 (-0500)
Subject: Merge branch 'master' of /storage/git/netwatch
X-Git-Url: http://git.joshuawise.com/netwatch.git/commitdiff_plain/953ec70c3a5163eb13db4bf998c9b21a3964df9c?hp=b908495a775a3a580b3a7c5a7ececb50accf9f76

Merge branch 'master' of /storage/git/netwatch
---

diff --git a/aseg-paging/pagingstub.c b/aseg-paging/pagingstub.c
index 80ff55d..849c6dc 100644
--- a/aseg-paging/pagingstub.c
+++ b/aseg-paging/pagingstub.c
@@ -4,6 +4,7 @@
 #include <minilib.h>
 #include <smi.h>
 #include <pci-bother.h>
+#include <serial.h>
 #include "../net/net.h"
 #include "vga-overlay.h"
 
@@ -111,10 +112,13 @@ void c_entry(void)
 
 	/* Turn paging on */
 	set_cr0(get_cr0() | CR0_PG);
+	serial_init();
+	serial_tx('A');
 	outb(0x80, 0xAA);
 
 	
 	if (!entry_initialized) {
+		serial_tx('B');
 		outb(0x80, 0xAB);
 		for (bp = (void *)0x200000; (void *)bp < (void *)&_bss; bp++)
 			*bp = *(bp + 0x100000);