diff --git a/core/acpi.c b/core/acpi.c
--- a/core/acpi.c
+++ b/core/acpi.c
@@ -29,20 +29,16 @@
 
 #include "acpi.h"
 #include "acpi_dsdt.h"
+#include "asm.h"
 #include "assert.h"
 #include "beep.h"
 #include "constants.h"
-#include "current.h"
 #include "initfunc.h"
-#include "io_io.h"
 #include "mm.h"
 #include "panic.h"
 #include "printf.h"
 #include "sleep.h"
 #include "string.h"
-#include "wakeup.h"
-#include "passthrough/vtd.h"
-#include "passthrough/iodom.h"
 
 #define FIND_RSDP_NOT_FOUND	0xFFFFFFFFFFFFFFFFULL
 #define RSDP_SIGNATURE		"RSD PTR"
@@ -305,6 +301,7 @@ debug_dump (void *p, int len)
 	}
 }
 
+#if 0
 static bool
 acpi_pm1_sleep (u32 v)
 {
@@ -408,6 +405,7 @@ acpi_iohook (void)
 		set_iofunc (smi_cmd, acpi_smi_monitor);
 	}
 }
+#endif
 
 static void
 get_pm1a_cnt_ioaddr (struct facp *q)
@@ -493,10 +491,7 @@ acpi_init_global (void)
 	u64 rsdp;
 	struct rsdp *p;
 	struct facp *q;
-	struct acpi_ent_dmar *r;
-	struct domain *create_dom() ;
 
-	wakeup_init ();
 	rsdp_found = false;
 	pm1a_cnt_found = false;
 
diff --git a/core/acpi.h b/core/acpi.h
--- a/core/acpi.h
+++ b/core/acpi.h
@@ -37,9 +37,7 @@ struct acpi_data {
 	bool smi_hook_disabled;
 };
 
-void acpi_iohook (void);
 void acpi_poweroff (void);
 bool get_acpi_time_raw (u32 *r);
-void acpi_smi_hook (void);
 
 #endif
diff --git a/core/callrealmode.c b/core/callrealmode.c
--- a/core/callrealmode.c
+++ b/core/callrealmode.c
@@ -31,7 +31,6 @@
 #include "assert.h"
 #include "callrealmode.h"
 #include "callrealmode_asm.h"
-#include "current.h"
 #include "entry.h"
 #include "initfunc.h"
 #include "mm.h"
@@ -39,9 +38,6 @@
 #include "savemsr.h"
 #include "seg.h"
 #include "string.h"
-#include "vmmcall_boot.h"
-
-static struct vcpu *callrealmode_vcpu;
 
 u32
 callrealmode_endofcodeaddr (void)
@@ -49,6 +45,7 @@ callrealmode_endofcodeaddr (void)
 	return CALLREALMODE_OFFSET + callrealmode_end - callrealmode_start;
 }
 
+#if 0
 static void
 callrealmode_clearvcpu (void)
 {
@@ -72,6 +69,7 @@ callrealmode_usevcpu (struct vcpu *p)
 {
 	callrealmode_vcpu = p;
 }
+#endif
 
 static void
 callrealmode_copy (void)
@@ -80,6 +78,7 @@ callrealmode_copy (void)
 		callrealmode_end - callrealmode_start);
 }
 
+#if 0
 static void
 callrealmode_call_vcpu (struct vcpu *c, struct callrealmode_data *d)
 {
@@ -131,6 +130,7 @@ callrealmode_call_vcpu (struct vcpu *c, 
 	memcpy (d, p, sizeof *d);
 	unmapmem (p, size);
 }
+#endif
 
 /* interrupts must be disabled */
 static void
@@ -237,10 +237,7 @@ callrealmode_call_directly (struct callr
 static void
 callrealmode_call (struct callrealmode_data *d)
 {
-	if (callrealmode_vcpu)
-		callrealmode_call_vcpu (callrealmode_vcpu, d);
-	else
-		callrealmode_call_directly (d);
+	callrealmode_call_directly (d);
 }
 
 void
@@ -380,6 +377,3 @@ callrealmode_startkernel32 (u32 paramsad
 	d.u.startkernel32.startaddr = startaddr;
 	callrealmode_call (&d);
 }
-
-INITFUNC ("global0", callrealmode_init_global);
-INITFUNC ("panic0", callrealmode_panic);
diff --git a/core/debug.c b/core/debug.c
--- a/core/debug.c
+++ b/core/debug.c
@@ -28,9 +28,7 @@
  */
 
 #include "constants.h"
-#include "cpu_mmu.h"
 #include "debug.h"
-#include "gmm_access.h"
 #include "i386-stub.h"
 #include "int.h"
 #include "mm.h"
@@ -40,7 +38,6 @@
 #include "serial.h"
 #include "string.h"
 #include "types.h"
-#include "vmmerr.h"
 
 static int memdump, memfree;
 #ifdef FWDBG
@@ -95,12 +92,6 @@ debug_addstr (char *str)
 static void
 memdump_gphys (void *data)
 {
-	struct memdump_gphys_data *d;
-	int i;
-
-	d = data;
-	for (i = 0; i < d->sendlen; i++)
-		read_gphys_b (d->physaddr + i, &d->q[i], 0);
 }
 
 static void
@@ -115,6 +106,7 @@ memdump_hvirt (void *data)
 static void
 memdump_gvirt (void *data)
 {
+#if 0
 	struct memdump_gvirt_data *dd;
 	struct memdump_data *d;
 	int i;
@@ -138,6 +130,7 @@ memdump_gvirt (void *data)
 		}
 		read_gphys_b (physaddr, &dd->q[i], 0);
 	}
+#endif
 }
 
 static int
diff --git a/core/main.c b/core/main.c
--- a/core/main.c
+++ b/core/main.c
@@ -32,12 +32,10 @@
 #include "callrealmode.h"
 #include "config.h"
 #include "convert.h"
-#include "current.h"
 #include "debug.h"
 #include "initfunc.h"
 #include "keyboard.h"
 #include "linkage.h"
-#include "loadbootsector.h"
 #include "main.h"
 #include "mm.h"
 #include "multiboot.h"
@@ -49,23 +47,11 @@
 #include "regs.h"
 #include "sleep.h"
 #include "string.h"
-#include "svm.h"
-#include "svm_init.h"
 #include "types.h"
-#include "vcpu.h"
-#include "vmmcall.h"
-#include "vmmcall_boot.h"
 #include "vramwrite.h"
-#include "vt.h"
-#include "vt_init.h"
 
 static struct multiboot_info mi;
-static u32 minios_startaddr;
-static u32 minios_paramsaddr;
-static u8 minios_params[OSLOADER_BOOTPARAMS_SIZE];
-static void *bios_data_area;
 static int shiftkey;
-static u8 imr_master, imr_slave;
 
 static void
 print_boot_msg (void)
@@ -75,6 +61,7 @@ print_boot_msg (void)
 	printf ("All rights reserved.\n");
 }
 
+#if 0
 static void
 print_startvm_msg (void)
 {
@@ -87,6 +74,7 @@ load_drivers (void)
 	printf ("Loading drivers.\n");
 	call_initfunc ("driver");
 }
+#endif
 
 static u8
 detect_bios_boot_device (struct multiboot_info *mi)
@@ -99,6 +87,7 @@ detect_bios_boot_device (struct multiboo
 	}
 }
 
+#if 0
 static void
 copy_minios (void)
 {
@@ -229,6 +218,7 @@ initregs (void)
 	current->vmctl.write_flags (RFLAGS_ALWAYS1_BIT);
 	current->vmctl.write_idtr (0, 0x3FF);
 }
+#endif
 
 static void
 sync_cursor_pos (void)
@@ -239,6 +229,7 @@ sync_cursor_pos (void)
 	callrealmode_setcursorpos (0, row, col);
 }
 
+#if 0
 static void
 save_bios_data_area (void)
 {
@@ -399,6 +390,7 @@ resume_vm (u32 wake_addr)
 	current->vmctl.start_vm ();
 	panic ("VM stopped.");
 }
+#endif
 
 static void
 get_shiftflags (void)
@@ -425,6 +417,7 @@ ap_proc (void)
 {
 	call_initfunc ("ap");
 	call_initfunc ("pcpu");
+	asm_cli_and_hlt ();
 }
 
 static void
@@ -432,6 +425,15 @@ bsp_proc (void)
 {
 	call_initfunc ("bsp");
 	call_initfunc ("pcpu");
+	for (;;) {
+		int d;
+
+		d = newprocess ("init");
+		debug_msgregister ();
+		msgsendint (d, 1);
+		debug_msgunregister ();
+		msgclose (d);
+	}
 }
 
 asmlinkage void
@@ -444,9 +446,6 @@ vmm_main (struct multiboot_info *mi_arg)
 }
 
 INITFUNC ("pcpu1", sync_all_processors);
-INITFUNC ("pcpu2", virtualization_init_pcpu);
-INITFUNC ("pcpu5", create_pass_vm);
 INITFUNC ("bsp0", debug_on_shift_key);
 INITFUNC ("global1", print_boot_msg);
-INITFUNC ("global3", copy_minios);
 INITFUNC ("global3", get_shiftflags);
diff --git a/core/main.h b/core/main.h
--- a/core/main.h
+++ b/core/main.h
@@ -30,6 +30,4 @@
 #ifndef _CORE_MAIN_H
 #define _CORE_MAIN_H
 
-void resume_vm (u32 wake_addr);
-
 #endif
diff --git a/core/mm.c b/core/mm.c
--- a/core/mm.c
+++ b/core/mm.c
@@ -32,9 +32,7 @@
 #include "callrealmode.h"
 #include "comphappy.h"
 #include "constants.h"
-#include "current.h"
 #include "entry.h"
-#include "gmm_access.h"
 #include "initfunc.h"
 #include "int.h"
 #include "linkage.h"
@@ -46,7 +44,7 @@
 #include "spinlock.h"
 #include "string.h"
 
-#define VMMSIZE_ALL		(128 * 1024 * 1024)
+#define VMMSIZE_ALL		(32 * 1024 * 1024)
 #define NUM_OF_PAGES		(VMMSIZE_ALL >> PAGESIZE_SHIFT)
 #define NUM_OF_ALLOCSIZE	13
 #define MAPMEM_ADDR_START	0xF0000000
@@ -1456,6 +1454,7 @@ pmap_open_vmm (pmap_t *m, ulong cr3, int
 	m->type = PMAP_TYPE_VMM;
 }
 
+#if 0
 void
 pmap_open_guest (pmap_t *m, ulong cr3, int levels, bool atomic)
 {
@@ -1473,6 +1472,7 @@ pmap_open_guest (pmap_t *m, ulong cr3, i
 	else
 		m->type = PMAP_TYPE_GUEST;
 }
+#endif
 
 void
 pmap_close (pmap_t *m)
@@ -1521,12 +1521,6 @@ pmap_rd32 (pmap_t *m, u64 phys, u32 attr
 	case PMAP_TYPE_VMM:
 		r = *(u32 *)phys_to_virt (phys);
 		break;
-	case PMAP_TYPE_GUEST:
-		read_gphys_l (phys, &r, attr);
-		break;
-	case PMAP_TYPE_GUEST_ATOMIC:
-		cmpxchg_gphys_l (phys, &r, r, attr);
-		break;
 	}
 	return r;
 }
@@ -1540,12 +1534,6 @@ pmap_rd64 (pmap_t *m, u64 phys, u32 attr
 	case PMAP_TYPE_VMM:
 		r = *(u64 *)phys_to_virt (phys);
 		break;
-	case PMAP_TYPE_GUEST:
-		read_gphys_q (phys, &r, attr);
-		break;
-	case PMAP_TYPE_GUEST_ATOMIC:
-		cmpxchg_gphys_q (phys, &r, r, attr);
-		break;
 	}
 	return r;
 }
@@ -1553,22 +1541,12 @@ pmap_rd64 (pmap_t *m, u64 phys, u32 attr
 static bool
 pmap_wr32 (pmap_t *m, u64 phys, u32 attr, u64 oldentry, u64 *entry)
 {
-	u32 tmp;
 	bool r = false;
 
 	switch (m->type) {
 	case PMAP_TYPE_VMM:
 		*(u32 *)phys_to_virt (phys) = *entry;
 		break;
-	case PMAP_TYPE_GUEST:
-		write_gphys_l (phys, *entry, attr);
-		break;
-	case PMAP_TYPE_GUEST_ATOMIC:
-		tmp = oldentry;
-		r = cmpxchg_gphys_l (phys, &tmp, *entry, attr);
-		if (r)
-			*entry = tmp;
-		break;
 	}
 	return r;
 }
@@ -1582,14 +1560,6 @@ pmap_wr64 (pmap_t *m, u64 phys, u32 attr
 	case PMAP_TYPE_VMM:
 		*(u64 *)phys_to_virt (phys) = *entry;
 		break;
-	case PMAP_TYPE_GUEST:
-		write_gphys_q (phys, *entry, attr);
-		break;
-	case PMAP_TYPE_GUEST_ATOMIC:
-		r = cmpxchg_gphys_q (phys, &oldentry, *entry, attr);
-		if (r)
-			*entry = oldentry;
-		break;
 	}
 	return r;
 }
@@ -1869,6 +1839,7 @@ mapped_hphys_addr (u64 hphys, uint len)
 	return (void *)(virt_t)(HPHYS_ADDR + hphys);
 }
 
+#if 0
 static void *
 mapped_gphys_addr (u64 gphys, uint len, int flags)
 {
@@ -1896,6 +1867,7 @@ mapped_gphys_addr (u64 gphys, uint len, 
 	}
 	return mapped_hphys_addr (hphys, len);
 }
+#endif
 
 static void *
 mapmem_alloc (pmap_t *m, uint offset, uint len)
@@ -1949,12 +1921,6 @@ mapmem_domap (pmap_t *m, void *virt, int
 		pmap_seek (m, v + (i << PAGESIZE_SHIFT), 1);
 		if (flags & MAPMEM_HPHYS) {
 			pte = (p + (i << PAGESIZE_SHIFT)) | PTE_P_BIT;
-		} else if (flags & MAPMEM_GPHYS) {
-			pte = current->gmm.gp2hp (p + (i << PAGESIZE_SHIFT),
-						  &fakerom);
-			if (fakerom && (flags & MAPMEM_WRITE))
-				return true;
-			pte = (pte & ~PAGESIZE_MASK) | PTE_P_BIT;
 		} else {
 			return true;
 		}
@@ -2015,11 +1981,6 @@ mapmem (int flags, u64 physaddr, uint le
 		if (!r)
 			goto skip;
 		return r;
-	} else if (flags & MAPMEM_GPHYS) {
-		r = mapped_gphys_addr (physaddr, len, flags);
-		if (!r)
-			goto skip;
-		return r;
 	}
 	return NULL;
 skip:
@@ -2043,12 +2004,6 @@ mapmem_hphys (u64 physaddr, uint len, in
 	return mapmem (MAPMEM_HPHYS | flags, physaddr, len);
 }
 
-void *
-mapmem_gphys (u64 physaddr, uint len, int flags)
-{
-	return mapmem (MAPMEM_GPHYS | flags, physaddr, len);
-}
-
 /* Flush all write back caches including other processors */
 void
 mm_flush_wb_cache (void)
diff --git a/core/mm.h b/core/mm.h
--- a/core/mm.h
+++ b/core/mm.h
@@ -48,8 +48,6 @@
 
 enum pmap_type {
 	PMAP_TYPE_VMM,
-	PMAP_TYPE_GUEST,
-	PMAP_TYPE_GUEST_ATOMIC,
 };
 
 typedef struct {
@@ -90,7 +88,6 @@ phys_t mm_process_switch (phys_t switcht
 
 /* accessing page tables */
 void pmap_open_vmm (pmap_t *m, ulong cr3, int levels);
-void pmap_open_guest (pmap_t *m, ulong cr3, int levels, bool atomic);
 void pmap_close (pmap_t *m);
 
 int pmap_getreadlevel (pmap_t *m);
diff --git a/core/panic.c b/core/panic.c
--- a/core/panic.c
+++ b/core/panic.c
@@ -31,7 +31,6 @@
 #include "callrealmode.h"
 #include "config.h"
 #include "cpu.h"
-#include "current.h"
 #include "debug.h"
 #include "initfunc.h"
 #include "keyboard.h"
@@ -41,6 +40,7 @@
 #include "printf.h"
 #include "process.h"
 #include "reboot.h"
+#include "regs.h"
 #include "sleep.h"
 #include "spinlock.h"
 #include "stdarg.h"
@@ -287,6 +287,7 @@ dump_vmm_other_regs (void)
 	backtrace ();
 }
 
+#if 0
 static void
 dump_vm_general_regs (void)
 {
@@ -406,6 +407,7 @@ dump_vm_other_regs (void)
 	if (current->vmctl.panic_dump)
 		current->vmctl.panic_dump ();
 }
+#endif
 
 static void
 wait_for_other_cpu (void)
@@ -435,15 +437,6 @@ panic_nomsg (bool w)
 		dump_vmm_other_regs ();
 		printf ("------------------------------------------------\n");
 	}
-	if (currentcpu_available () && current) {
-		printf ("Guest state and registers of cpu %d ------------\n",
-			get_cpu_id ());
-		dump_vm_general_regs ();
-		dump_vm_control_regs ();
-		dump_vm_sregs ();
-		dump_vm_other_regs ();
-		printf ("------------------------------------------------\n");
-	}
 	if (!w && do_wakeup) {
 		do_wakeup = false;
 		sleep_set_timer_counter ();
diff --git a/core/pcpu.h b/core/pcpu.h
--- a/core/pcpu.h
+++ b/core/pcpu.h
@@ -34,10 +34,8 @@
 #include "desc.h"
 #include "seg.h"
 #include "spinlock.h"
-#include "svm.h"
 #include "thread.h"
 #include "types.h"
-#include "vt.h"
 
 #define NUM_OF_SEGDESCTBL 32
 #define PCPU_GS_ALIGN  __attribute__ ((aligned (8)))
@@ -57,8 +55,6 @@ struct pcpu {
 	struct segdesc segdesctbl[NUM_OF_SEGDESCTBL];
 	struct tss32 tss32;
 	struct tss64 tss64;
-	struct vt_pcpu_data vt;
-	struct svm_pcpu_data svm;
 	enum fullvirtualize_type fullvirtualize;
 	int cpunum;
 	int pid;
diff --git a/core/serial.c b/core/serial.c
--- a/core/serial.c
+++ b/core/serial.c
@@ -29,7 +29,6 @@
 
 #include "asm.h"
 #include "initfunc.h"
-#include "io_io.h"
 #include "process.h"
 #include "serial.h"
 #include "types.h"
@@ -171,7 +170,7 @@ serial_init_iohook (void)
 	unsigned int i;
 
 	for (i = PORT; i < PORT + NUM_OF_PORT; i++)
-		set_iofunc (i, do_io_nothing);
+		;
 }
 
 static void
diff --git a/core/serial.h b/core/serial.h
--- a/core/serial.h
+++ b/core/serial.h
@@ -33,6 +33,5 @@
 void serial_putDebugChar (int c);
 int serial_getDebugChar (void);
 void serial_putchar (unsigned char c);
-void serial_init_iohook (void);
 
 #endif
diff --git a/core/time.c b/core/time.c
--- a/core/time.c
+++ b/core/time.c
@@ -42,7 +42,6 @@
 #include "sleep.h"
 #include "spinlock.h"
 #include "time.h"
-#include "vmmcall_status.h"
 
 static u64 volatile lasttime;
 static u64 lastacpitime;
@@ -173,6 +172,7 @@ time_init_msg (void)
 		msgregister ("time", time_msghandler);
 }
 
+#if 0
 static char *
 time_status (void)
 {
@@ -198,6 +198,7 @@ time_init_global_status (void)
 {
 	register_status_callback (time_status);
 }
+#endif
 
 static void
 time_init_global (void)
@@ -208,6 +209,5 @@ time_init_global (void)
 }
 
 INITFUNC ("global3", time_init_global);
-INITFUNC ("global4", time_init_global_status);
 INITFUNC ("pcpu3", time_init_pcpu);
 INITFUNC ("msg0", time_init_msg);
diff --git a/include/core/mm.h b/include/core/mm.h
--- a/include/core/mm.h
+++ b/include/core/mm.h
@@ -33,7 +33,6 @@
 #include <core/types.h>
 
 #define MAPMEM_HPHYS			0x1
-#define MAPMEM_GPHYS			0x2
 #define MAPMEM_WRITE			0x4
 #define MAPMEM_PWT			0x8
 #define MAPMEM_PCD			0x10
@@ -59,6 +58,5 @@ void mempool_freemem (struct mempool *mp
 void unmapmem (void *virt, uint len);
 void *mapmem (int flags, u64 physaddr, uint len);
 void *mapmem_hphys (u64 physaddr, uint len, int flags);
-void *mapmem_gphys (u64 physaddr, uint len, int flags);
 
 #endif

diff --git a/core/callrealmode.c b/core/callrealmode.c
--- a/core/callrealmode.c
+++ b/core/callrealmode.c
@@ -377,3 +377,13 @@ callrealmode_startkernel32 (u32 paramsad
 	d.u.startkernel32.startaddr = startaddr;
 	callrealmode_call (&d);
 }
+
+int
+callrealmode_getkey (void)
+{
+	struct callrealmode_data d;
+
+	d.func = CALLREALMODE_FUNC_GETKEY;
+	callrealmode_call (&d);
+	return d.u.getkey.ax_ret;
+}
diff --git a/core/callrealmode.h b/core/callrealmode.h
--- a/core/callrealmode.h
+++ b/core/callrealmode.h
@@ -91,5 +91,6 @@ bool callrealmode_bootcd_getstatus (u8 d
 void callrealmode_setcursorpos (u8 page_num, u8 row, u8 column);
 void callrealmode_startkernel32 (u32 paramsaddr, u32 startaddr);
 void callrealmode_tcgbios (u32 al, struct tcgbios_args *args);
+int callrealmode_getkey (void);
 
 #endif
diff --git a/core/callrealmode_asm.h b/core/callrealmode_asm.h
--- a/core/callrealmode_asm.h
+++ b/core/callrealmode_asm.h
@@ -48,6 +48,7 @@ enum callrealmode_func {
 	CALLREALMODE_FUNC_SETCURSORPOS = 0x8,
 	CALLREALMODE_FUNC_STARTKERNEL32 = 0x9,
 	CALLREALMODE_FUNC_TCGBIOS = 0xA,
+	CALLREALMODE_FUNC_GETKEY = 0xB,
 };
 
 struct callrealmode_printmsg {
@@ -106,6 +107,10 @@ struct callrealmode_tcgbios {
 	u32 al;
 } __attribute__ ((packed));
 
+struct callrealmode_getkey {
+	u16 ax_ret;
+};
+
 struct callrealmode_data {
 	enum callrealmode_func func : 32;
 	union {
@@ -119,6 +124,7 @@ struct callrealmode_data {
 		struct callrealmode_setcursorpos setcursorpos;
 		struct callrealmode_startkernel32 startkernel32;
 		struct callrealmode_tcgbios tcgbios;
+		struct callrealmode_getkey getkey;
 	} u;
 } __attribute__ ((packed));
 
diff --git a/core/callrealmode_asm.s b/core/callrealmode_asm.s
--- a/core/callrealmode_asm.s
+++ b/core/callrealmode_asm.s
@@ -39,6 +39,7 @@
 	CALLREALMODE_FUNC_SETCURSORPOS = 0x8
 	CALLREALMODE_FUNC_STARTKERNEL32 = 0x9
 	CALLREALMODE_FUNC_TCGBIOS = 0xA
+	CALLREALMODE_FUNC_GETKEY = 0xB
 
 	SEG_SEL_CODE_REAL = 0x0000
 	SEG_SEL_DATA_REAL = 0x0000
@@ -172,6 +173,7 @@ callrealmode_switch:
 	OFF_TCGBIOS_IN_ES = 0x60
 	OFF_TCGBIOS_IN_DS = 0x64
 	OFF_TCGBIOS_AL = 0x68
+	OFF_GETKEY_AX_RET = 0x30
 
 	# Which function?
 	mov	OFF_FUNC(%bp),%ax
@@ -197,6 +199,8 @@ callrealmode_switch:
 	je	startkernel32
 	cmp	$CALLREALMODE_FUNC_TCGBIOS,%ax
 	je	tcgbios
+	cmp	$CALLREALMODE_FUNC_GETKEY,%ax
+	je	getkey
 	# Error!
 	cld
 	mov	$(errormsg_data-1-callrealmode_start+CALLREALMODE_OFFSET),%di
@@ -424,6 +428,17 @@ tcgbios:
 	mov	%ds,OFF_TCGBIOS_OUT_DS(%bp)
 	ret
 
+# getkey
+#
+getkey:
+	# Enable interrupts
+	sti
+	# Call int $0x16
+	mov	$0x00,%ah
+	int	$0x16
+	mov	%ax,OFF_GETKEY_AX_RET(%bp)
+	ret
+
 # Subroutines
 #
 paging_and_protection_off:
diff --git a/core/keyboard.c b/core/keyboard.c
--- a/core/keyboard.c
+++ b/core/keyboard.c
@@ -28,6 +28,7 @@
  */
 
 #include "asm.h"
+#include "callrealmode.h"
 #include "initfunc.h"
 #include "keyboard.h"
 #include "process.h"
@@ -186,8 +187,11 @@ keyboard_getchar (void)
 
 	spinlock_lock (&keyboard_lock);
 retry:
-	key = keyboard_getkey ();
-	c = keycode_to_ascii (key);
+	c = callrealmode_getkey ();
+	if (c & 0xFF)
+		c &= 0xFF;
+	else
+		c = keycode_to_ascii (c >> 8);
 	if (c < 0)
 		goto retry;
 	spinlock_unlock (&keyboard_lock);