Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

3 files changed, 2 insertions, 19 deletions

diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c
index 01572814abe4..5db9d3bcbbcb 100644
--- a/arch/ia64/kernel/ia64_ksyms.c
+++ b/arch/ia64/kernel/ia64_ksyms.c
@@ -42,6 +42,7 @@ EXPORT_SYMBOL(clear_page);
 
 #ifdef CONFIG_VIRTUAL_MEM_MAP
 #include <linux/bootmem.h>
+EXPORT_SYMBOL(min_low_pfn);     /* defined by bootmem.c, but not exported by generic code */
 EXPORT_SYMBOL(max_low_pfn);     /* defined by bootmem.c, but not exported by generic code */
 #endif
 
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 801eeaeaf3de..2895d6e6062f 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -740,7 +740,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
         switch(val) {
         case DIE_BREAK:
                 /* err is break number from ia64_bad_break() */
-                if (args->err == 0x80200 || args->err == 0x80300)
+                if (args->err == 0x80200 || args->err == 0x80300 || args->err == 0)
                         if (pre_kprobes_handler(args))
                                 ret = NOTIFY_STOP;
                 break;
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c
index fba5fdd1f968..d3e0ecb56d62 100644
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
@@ -132,24 +132,6 @@ __kprobes ia64_bad_break (unsigned long break_num, struct pt_regs *regs)
         siginfo_t siginfo;
         int sig, code;
 
-        /* break.b always sets cr.iim to 0, which causes problems for
-         * debuggers.  Get the real break number from the original instruction,
-         * but only for kernel code.  User space break.b is left alone, to
-         * preserve the existing behaviour.  All break codings have the same
-         * format, so there is no need to check the slot type.
-         */
-        if (break_num == 0 && !user_mode(regs)) {
-                struct ia64_psr *ipsr = ia64_psr(regs);
-                unsigned long *bundle = (unsigned long *)regs->cr_iip;
-                unsigned long slot;
-                switch (ipsr->ri) {
-                      case 0:  slot = (bundle[0] >>  5); break;
-                      case 1:  slot = (bundle[0] >> 46) | (bundle[1] << 18); break;
-                      default: slot = (bundle[1] >> 23); break;
-                }
-                break_num = ((slot >> 36 & 1) << 20) | (slot >> 6 & 0xfffff);
-        }
-
         /* SIGILL, SIGFPE, SIGSEGV, and SIGBUS want these field initialized: */
         siginfo.si_addr = (void __user *) (regs->cr_iip + ia64_psr(regs)->ri);
         siginfo.si_imm = break_num;