Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / blackfin / kernel / kgdb.c

diff --git a/arch/blackfin/kernel/kgdb.c b/arch/blackfin/kernel/kgdb.c
index edae461b1c545d4f02e3c91ac664ec55012b9c4c..eb92592fd80ccb4beddb6ee828179c05f03d3d90 100644 (file)
--- a/arch/blackfin/kernel/kgdb.c
+++ b/arch/blackfin/kernel/kgdb.c
@@ -345,6 +345,23 @@ void kgdb_roundup_cpu(int cpu, unsigned long flags)
 }
 #endif
 
+#ifdef CONFIG_IPIPE
+static unsigned long kgdb_arch_imask;
+#endif
+
+void kgdb_post_primary_code(struct pt_regs *regs, int e_vector, int err_code)
+{
+       if (kgdb_single_step)
+               preempt_enable();
+
+#ifdef CONFIG_IPIPE
+       if (kgdb_arch_imask) {
+               cpu_pda[raw_smp_processor_id()].ex_imask = kgdb_arch_imask;
+               kgdb_arch_imask = 0;
+       }
+#endif
+}
+
 int kgdb_arch_handle_exception(int vector, int signo,
                               int err_code, char *remcom_in_buffer,
                               char *remcom_out_buffer,
@@ -388,6 +405,12 @@ int kgdb_arch_handle_exception(int vector, int signo,
                         * kgdb_single_step > 0 means in single step mode
                         */
                        kgdb_single_step = i + 1;
+
+                       preempt_disable();
+#ifdef CONFIG_IPIPE
+                       kgdb_arch_imask = cpu_pda[raw_smp_processor_id()].ex_imask;
+                       cpu_pda[raw_smp_processor_id()].ex_imask = 0;
+#endif
                }
 
                bfin_correct_hw_break();
@@ -448,6 +471,9 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip)
 int kgdb_arch_init(void)
 {
        kgdb_single_step = 0;
+#ifdef CONFIG_IPIPE
+       kgdb_arch_imask = 0;
+#endif
 
        bfin_remove_all_hw_break();
        return 0;