diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:23:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:23:59 -0400 |
| commit | ace7f1b79670aa0c1d9f4b0442be82e565827333 (patch) | |
| tree | ed4625a9cbc8e28db2b1ff9fad111c4c012508a3 /kernel/kgdb.c | |
| parent | a60b33cf59d1c9e0e363287fce799cb23d45660c (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into core/softirq
Diffstat (limited to 'kernel/kgdb.c')
| -rw-r--r-- | kernel/kgdb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/kgdb.c b/kernel/kgdb.c index 79e3c90113c2..3ec23c3ec97f 100644 --- a/kernel/kgdb.c +++ b/kernel/kgdb.c | |||
| @@ -1499,7 +1499,8 @@ int kgdb_nmicallback(int cpu, void *regs) | |||
| 1499 | return 1; | 1499 | return 1; |
| 1500 | } | 1500 | } |
| 1501 | 1501 | ||
| 1502 | void kgdb_console_write(struct console *co, const char *s, unsigned count) | 1502 | static void kgdb_console_write(struct console *co, const char *s, |
| 1503 | unsigned count) | ||
| 1503 | { | 1504 | { |
| 1504 | unsigned long flags; | 1505 | unsigned long flags; |
| 1505 | 1506 | ||