diff --git a/[refs] b/[refs]
index fab778404c49..d1a01601e537 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a7017370aa0a94a00ae5b5705e9169cdcae5fb8
+refs/heads/master: aea5f9f89bae5d5f9eb3fe3cddedbbfb82e6e44f
diff --git a/trunk/arch/x86/kernel/traps_32.c b/trunk/arch/x86/kernel/traps_32.c
index f60feee83253..d7cc292691ff 100644
--- a/trunk/arch/x86/kernel/traps_32.c
+++ b/trunk/arch/x86/kernel/traps_32.c
@@ -1198,6 +1198,7 @@ void __init trap_init(void)
 	early_iounmap(p, 4);
 #endif
 
+	set_trap_gate(0,  &divide_error);
 	set_intr_gate(1,  &debug);
 	set_intr_gate(2,  &nmi);
 	set_system_intr_gate(3, &int3); /* int3/4 can be called from all */