diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-22 11:53:20 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-22 11:53:23 +0100 |
| commit | 6c529a266bdc590a870ee2d2092ff6527eff427b (patch) | |
| tree | 7be65fa2578820a1258b5a1e8e063a509a5d6176 /drivers/serial/kgdboc.c | |
| parent | 7639dae0ca11038286bbbcda05f2bef601c1eb8d (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge commit 'v2.6.37-rc7' into perf/core
Merge reason: Pick up the latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/serial/kgdboc.c')
| -rw-r--r-- | drivers/serial/kgdboc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/serial/kgdboc.c b/drivers/serial/kgdboc.c index 3374618300af..25a8bc565f40 100644 --- a/drivers/serial/kgdboc.c +++ b/drivers/serial/kgdboc.c @@ -90,7 +90,8 @@ static DECLARE_WORK(kgdboc_restore_input_work, kgdboc_restore_input_helper); static void kgdboc_restore_input(void) { - schedule_work(&kgdboc_restore_input_work); + if (likely(system_state == SYSTEM_RUNNING)) + schedule_work(&kgdboc_restore_input_work); } static int kgdboc_register_kbd(char **cptr) |