um: fix call tracer and bug handler
authorRichard Weinberger <>
Thu, 14 Apr 2011 22:22:17 +0000 (15:22 -0700)
committerLinus Torvalds <>
Thu, 14 Apr 2011 23:06:56 +0000 (16:06 -0700)
Commit 1de1502c ("x86, um: now we can get rid of trivial uml headers")
removed accidentally bug.h which broke UML's call tracer and bug

Without asm-generic/bug.h UML uses BUG() from arch/x86/ which makes use
of ud2.  UML cannot use ud2, it raises SIGILL in user mode.  As UML has
a different stack for handling signals the call trace will be cut off.

Signed-off-by: Richard Weinberger <>
Reported-by: Sergei Trofimovich <>
Tested-by: Sergei Trofimovich <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
arch/um/include/asm/bug.h [new file with mode: 0644]

diff --git a/arch/um/include/asm/bug.h b/arch/um/include/asm/bug.h
new file mode 100644 (file)
index 0000000..9e33b86
--- /dev/null
@@ -0,0 +1,6 @@
+#ifndef __UM_BUG_H
+#define __UM_BUG_H
+#include <asm-generic/bug.h>