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

diff --cc aseg-paging/pagingstub.c
index 80ff55d959bda893f5422abbb79897ab58b90a7b,89699982c4e82fabfd243abd31172d72746dd32e..849c6dc3a01eb1d4c89de7ef6ec301a747162b3e
--- 1/aseg-paging/pagingstub.c
--- 2/aseg-paging/pagingstub.c
+++ b/aseg-paging/pagingstub.c
@@@ -111,18 -113,20 +112,21 @@@ 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);
 -
                for (bp = (void *)&_bss; (void *)bp < (void *)&_bssend; bp++)
                        *bp = 0;
 -                      */
        }
  
 -      smi_entry();
 +      outb(0x80, 0xAC);
 +      ps_switch_stack(smi_entry, 0x2FF000);
 +      outb(0x80, 0xFA);
  }