aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorJonathan Herman <hermanjl@cs.unc.edu>2013-02-18 11:58:44 -0500
committerJonathan Herman <hermanjl@cs.unc.edu>2013-02-18 11:58:44 -0500
commit44f61e6c269e0a85b6cac608c6ee29d3dbbf21ad (patch)
treed816b63f2e22a62d21c09aeacc01e058c69852a8 /arch/arm/kernel
parent7806057274c493d53a214232d4df6f96aadc7547 (diff)
Clean this commitwip-mc
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/kgdb.c4
-rw-r--r--arch/arm/kernel/traps.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/kernel/kgdb.c b/arch/arm/kernel/kgdb.c
index 778c2f7024f..33a807aef59 100644
--- a/arch/arm/kernel/kgdb.c
+++ b/arch/arm/kernel/kgdb.c
@@ -118,6 +118,8 @@ int kgdb_arch_handle_exception(int exception_vector, int signo,
118 unsigned long addr; 118 unsigned long addr;
119 char *ptr; 119 char *ptr;
120 120
121 printk(KERN_WARNING "Handling exception dog\n");
122
121 switch (remcom_in_buffer[0]) { 123 switch (remcom_in_buffer[0]) {
122 case 'D': 124 case 'D':
123 case 'k': 125 case 'k':
@@ -144,6 +146,7 @@ int kgdb_arch_handle_exception(int exception_vector, int signo,
144 146
145static int kgdb_brk_fn(struct pt_regs *regs, unsigned int instr) 147static int kgdb_brk_fn(struct pt_regs *regs, unsigned int instr)
146{ 148{
149 printk(KERN_WARNING "SW break\n");
147 kgdb_handle_exception(1, SIGTRAP, 0, regs); 150 kgdb_handle_exception(1, SIGTRAP, 0, regs);
148 151
149 return 0; 152 return 0;
@@ -151,6 +154,7 @@ static int kgdb_brk_fn(struct pt_regs *regs, unsigned int instr)
151 154
152static int kgdb_compiled_brk_fn(struct pt_regs *regs, unsigned int instr) 155static int kgdb_compiled_brk_fn(struct pt_regs *regs, unsigned int instr)
153{ 156{
157 printk(KERN_WARNING "Compiled break\n");
154 compiled_break = 1; 158 compiled_break = 1;
155 kgdb_handle_exception(1, SIGTRAP, 0, regs); 159 kgdb_handle_exception(1, SIGTRAP, 0, regs);
156 160
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 4ef9f0d04e5..c1b04735229 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -24,6 +24,7 @@
24#include <linux/delay.h> 24#include <linux/delay.h>
25#include <linux/init.h> 25#include <linux/init.h>
26#include <linux/sched.h> 26#include <linux/sched.h>
27#include <linux/kgdb.h>
27 28
28#include <linux/atomic.h> 29#include <linux/atomic.h>
29#include <asm/cacheflush.h> 30#include <asm/cacheflush.h>
@@ -710,7 +711,7 @@ baddataabort(int code, unsigned long instr, struct pt_regs *regs)
710 711
711void __attribute__((noreturn)) __bug(const char *file, int line) 712void __attribute__((noreturn)) __bug(const char *file, int line)
712{ 713{
713 printk(KERN_CRIT"kernel BUG at %s:%d!\n", file, line); 714 printk(KERN_CRIT"kernel BUG you got this arch at %s:%d!\n", file, line);
714 *(int *)0 = 0; 715 *(int *)0 = 0;
715 716
716 /* Avoid "noreturn function does return" */ 717 /* Avoid "noreturn function does return" */