Clean this commitwip-mc

2 files changed, 31 insertions, 2 deletions

diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
index 0d7c08784ef..25c2c64f668 100644
--- a/kernel/debug/debug_core.c
+++ b/kernel/debug/debug_core.c
@@ -465,9 +465,13 @@ static int kgdb_cpu_enter(struct kgdb_state *ks, struct pt_regs *regs,
         int trace_on = 0;
         int online_cpus = num_online_cpus();
 
+        //printk(KERN_WARNING "Cpu enter\n");
+
         kgdb_info[ks->cpu].enter_kgdb++;
         kgdb_info[ks->cpu].exception_state |= exception_state;
 
+
+
         if (exception_state == DCPU_WANT_MASTER)
                 atomic_inc(&masters_in_kgdb);
         else
@@ -477,6 +481,7 @@ static int kgdb_cpu_enter(struct kgdb_state *ks, struct pt_regs *regs,
                 arch_kgdb_ops.disable_hw_break(regs);
 
 acquirelock:
+        //printk(KERN_WARNING "acquirelock\n");
         /*
          * Interrupts will be restored by the 'trap return' code, except when
          * single stepping.
@@ -495,6 +500,7 @@ acquirelock:
         if (exception_level == 1) {
                 if (raw_spin_trylock(&dbg_master_lock))
                         atomic_xchg(&kgdb_active, cpu);
+
                 goto cpu_master_loop;
         }
 
@@ -504,6 +510,7 @@ acquirelock:
          */
         while (1) {
 cpu_loop:
+                //printk(KERN_WARNING "cpu loop\n");
                 if (kgdb_info[cpu].exception_state & DCPU_NEXT_MASTER) {
                         kgdb_info[cpu].exception_state &= ~DCPU_NEXT_MASTER;
                         goto cpu_master_loop;
@@ -517,6 +524,7 @@ cpu_loop:
                                 goto return_normal;
                 } else {
 return_normal:
+                        //printk(KERN_WARNING "return normal\n");
                         /* Return to normal operation by executing any
                          * hw breakpoint fixup.
                          */
@@ -536,6 +544,8 @@ return_normal:
                 cpu_relax();
         }
 
+        //printk(KERN_WARNING "out of 1\n");
+
         /*
          * For single stepping, try to only enter on the processor
          * that was single stepping.  To guard against a deadlock, the
@@ -555,14 +565,17 @@ return_normal:
 
         if (!kgdb_io_ready(1)) {
                 kgdb_info[cpu].ret_state = 1;
+                //printk(KERN_WARNING "io not ready\n");
                 goto kgdb_restore; /* No I/O connection, resume the system */
         }
 
         /*
          * Don't enter if we have hit a removed breakpoint.
          */
-        if (kgdb_skipexception(ks->ex_vector, ks->linux_regs))
+        if (kgdb_skipexception(ks->ex_vector, ks->linux_regs)) {
+                //printk(KERN_WARNING "skipping\n");
                 goto kgdb_restore;
+        }
 
         /* Call the I/O driver's pre_exception routine */
         if (dbg_io_ops->pre_exception)
@@ -577,8 +590,11 @@ return_normal:
 
 #ifdef CONFIG_SMP
         /* Signal the other CPUs to enter kgdb_wait() */
-        if ((!kgdb_single_step) && kgdb_do_roundup)
+        if ((!kgdb_single_step) && kgdb_do_roundup) {
+                printk(KERN_WARNING "Rounding up cpus...\n");
                 kgdb_roundup_cpus(flags);
+                printk(KERN_WARNING "Rounded up\n");
+        }
 #endif
 
         /*
@@ -587,6 +603,7 @@ return_normal:
         while (kgdb_do_roundup && (atomic_read(&masters_in_kgdb) +
                                 atomic_read(&slaves_in_kgdb)) != online_cpus)
                 cpu_relax();
+        //printk(KERN_WARNING "Waited\n");
 
         /*
          * At this point the primary processor is completely
@@ -602,7 +619,9 @@ return_normal:
 
         while (1) {
 cpu_master_loop:
+                //printk(KERN_WARNING "master loop\n");
                 if (dbg_kdb_mode) {
+                        //printk(KERN_WARNING "kdb mode\n");
                         kgdb_connected = 1;
                         error = kdb_stub(ks);
                         if (error == -1)
@@ -636,6 +655,7 @@ cpu_master_loop:
         }
 
 kgdb_restore:
+        //printk(KERN_WARNING "restore\n");
         if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
                 int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
                 if (kgdb_info[sstep_cpu].task)
@@ -675,6 +695,8 @@ kgdb_handle_exception(int evector, int signo, int ecode, struct pt_regs *regs)
         struct kgdb_state kgdb_var;
         struct kgdb_state *ks = &kgdb_var;
 
+        printk(KERN_WARNING "enter exception thing\n");
+
         ks->cpu                 = raw_smp_processor_id();
         ks->ex_vector           = evector;
         ks->signo               = signo;
@@ -954,11 +976,16 @@ int dbg_io_get_char(void)
  */
 void kgdb_breakpoint(void)
 {
+        printk(KERN_WARNING "Doin this\n");
         atomic_inc(&kgdb_setting_breakpoint);
+        printk(KERN_WARNING "Doin this1\n");
         wmb(); /* Sync point before breakpoint */
+        printk(KERN_WARNING "Doin this2\n");
         arch_kgdb_breakpoint();
         wmb(); /* Sync point after breakpoint */
+        printk(KERN_WARNING "Doin this\n");
         atomic_dec(&kgdb_setting_breakpoint);
+        printk(KERN_WARNING "Doin this\n");
 }
 EXPORT_SYMBOL_GPL(kgdb_breakpoint);
 
diff --git a/kernel/debug/gdbstub.c b/kernel/debug/gdbstub.c
index 34872482315..e0134e3cc5e 100644
--- a/kernel/debug/gdbstub.c
+++ b/kernel/debug/gdbstub.c
@@ -941,6 +941,8 @@ int gdb_serial_stub(struct kgdb_state *ks)
         int error = 0;
         int tmp;
 
+        printk(KERN_WARNING "Serial stub\n");
+
         /* Initialize comm buffer and globals. */
         memset(remcom_out_buffer, 0, sizeof(remcom_out_buffer));
         kgdb_usethread = kgdb_info[ks->cpu].task;