The patch titled
UML: add generic BUG support
has been added to the -mm tree. Its filename is
uml-add-generic-bug-support.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: UML: add generic BUG support
From: Jeff Dike <jdike@xxxxxxxxxxx>
The BUG changes in -mm3 need some arch support. This patch adds the UML
support needed. For the most part, it was stolen from the underlying
architecture. The exception is the kernel eip < PAGE_OFFSET test, which is
wrong for skas mode UMLs.
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>
Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/Kconfig | 5 +++++
arch/um/sys-i386/Makefile | 2 +-
arch/um/sys-i386/bug.c | 20 ++++++++++++++++++++
arch/um/sys-x86_64/Makefile | 2 +-
arch/um/sys-x86_64/bug.c | 20 ++++++++++++++++++++
include/asm-um/bug.h | 4 +++-
6 files changed, 50 insertions(+), 3 deletions(-)
diff -puN arch/um/Kconfig~uml-add-generic-bug-support arch/um/Kconfig
--- a/arch/um/Kconfig~uml-add-generic-bug-support
+++ a/arch/um/Kconfig
@@ -29,6 +29,11 @@ config GENERIC_CALIBRATE_DELAY
bool
default y
+config GENERIC_BUG
+ bool
+ default y
+ depends on BUG
+
# Used in kernel/irq/manage.c and include/linux/irq.h
config IRQ_RELEASE_METHOD
bool
diff -puN arch/um/sys-i386/Makefile~uml-add-generic-bug-support arch/um/sys-i386/Makefile
--- a/arch/um/sys-i386/Makefile~uml-add-generic-bug-support
+++ a/arch/um/sys-i386/Makefile
@@ -1,4 +1,4 @@
-obj-y = bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \
+obj-y = bug.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \
ptrace_user.o setjmp.o signal.o sigcontext.o syscalls.o sysrq.o \
sys_call_table.o tls.o
diff -puN /dev/null arch/um/sys-i386/bug.c
--- /dev/null
+++ a/arch/um/sys-i386/bug.c
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2006 Jeff Dike (jdike@xxxxxxxxxxx)
+ * Licensed under the GPL V2
+ */
+
+#include <linux/uaccess.h>
+
+/* Mostly copied from i386/x86_86 - eliminated the eip < PAGE_OFFSET because
+ * that's not relevent in skas mode.
+ */
+
+int is_valid_bugaddr(unsigned long eip)
+{
+ unsigned short ud2;
+
+ if (probe_kernel_address((unsigned short __user *)eip, ud2))
+ return 0;
+
+ return ud2 == 0x0b0f;
+}
diff -puN arch/um/sys-x86_64/Makefile~uml-add-generic-bug-support arch/um/sys-x86_64/Makefile
--- a/arch/um/sys-x86_64/Makefile~uml-add-generic-bug-support
+++ a/arch/um/sys-x86_64/Makefile
@@ -4,7 +4,7 @@
# Licensed under the GPL
#
-obj-y = bugs.o delay.o fault.o ldt.o mem.o ptrace.o ptrace_user.o \
+obj-y = bug.o bugs.o delay.o fault.o ldt.o mem.o ptrace.o ptrace_user.o \
setjmp.o sigcontext.o signal.o syscalls.o syscall_table.o sysrq.o \
ksyms.o tls.o
diff -puN /dev/null arch/um/sys-x86_64/bug.c
--- /dev/null
+++ a/arch/um/sys-x86_64/bug.c
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2006 Jeff Dike (jdike@xxxxxxxxxxx)
+ * Licensed under the GPL V2
+ */
+
+#include <linux/uaccess.h>
+
+/* Mostly copied from i386/x86_86 - eliminated the eip < PAGE_OFFSET because
+ * that's not relevent in skas mode.
+ */
+
+int is_valid_bugaddr(unsigned long eip)
+{
+ unsigned short ud2;
+
+ if (probe_kernel_address((unsigned short __user *)eip, ud2))
+ return 0;
+
+ return ud2 == 0x0b0f;
+}
diff -puN include/asm-um/bug.h~uml-add-generic-bug-support include/asm-um/bug.h
--- a/include/asm-um/bug.h~uml-add-generic-bug-support
+++ a/include/asm-um/bug.h
@@ -1,4 +1,6 @@
#ifndef __UM_BUG_H
#define __UM_BUG_H
-#include <asm-generic/bug.h>
+
+#include <asm/arch/bug.h>
+
#endif
_
Patches currently in -mm which might be from jdike@xxxxxxxxxxx are
origin.patch
uml-add-generic-bug-support.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
