diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-10-12 09:44:33 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-10-12 09:44:33 -0400 |
| commit | 0d62950125241a6e6db8e8f14271f098ec7a2da4 (patch) | |
| tree | 8cdd9e17f6a6ff4cb6166ad12a4d3ed1d45b2dc9 /arch/mips/kernel/kgdb.c | |
| parent | b3bc2c5562f06ca34b30f61c5714e96490946c81 (diff) | |
| parent | 5e7184ae0dd49456387e8b1cdebc6b2c92fc6d51 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/atmel-mci-2.6.28
Diffstat (limited to 'arch/mips/kernel/kgdb.c')
| -rw-r--r-- | arch/mips/kernel/kgdb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/kernel/kgdb.c b/arch/mips/kernel/kgdb.c index 8f6d58ede33c..6e152c80cd4a 100644 --- a/arch/mips/kernel/kgdb.c +++ b/arch/mips/kernel/kgdb.c | |||
| @@ -236,8 +236,7 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code, | |||
| 236 | 236 | ||
| 237 | atomic_set(&kgdb_cpu_doing_single_step, -1); | 237 | atomic_set(&kgdb_cpu_doing_single_step, -1); |
| 238 | if (remcom_in_buffer[0] == 's') | 238 | if (remcom_in_buffer[0] == 's') |
| 239 | if (kgdb_contthread) | 239 | atomic_set(&kgdb_cpu_doing_single_step, cpu); |
| 240 | atomic_set(&kgdb_cpu_doing_single_step, cpu); | ||
| 241 | 240 | ||
| 242 | return 0; | 241 | return 0; |
| 243 | } | 242 | } |