diff options
| author | Russell King | 2009-12-06 18:00:33 +0100 |
|---|---|---|
| committer | Russell King | 2009-12-06 18:00:33 +0100 |
| commit | 3d14b5beba35250c548d3851a2b84fce742d8311 (patch) | |
| tree | 065e3d93c3fcbc5ee4c44fa78662393cddbdf6de /arch/x86/mm/kmmio.c | |
| parent | Merge branch 'devel-stable' into devel (diff) | |
| parent | Fix soc_common PCMCIA configuration (diff) | |
| download | kernel-qcow2-linux-3d14b5beba35250c548d3851a2b84fce742d8311.tar.gz kernel-qcow2-linux-3d14b5beba35250c548d3851a2b84fce742d8311.tar.xz kernel-qcow2-linux-3d14b5beba35250c548d3851a2b84fce742d8311.zip | |
Merge branch 'sa1100' into devel
Diffstat (limited to 'arch/x86/mm/kmmio.c')
| -rw-r--r-- | arch/x86/mm/kmmio.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c index 16ccbd77917f..11a4ad4d6253 100644 --- a/arch/x86/mm/kmmio.c +++ b/arch/x86/mm/kmmio.c @@ -540,8 +540,14 @@ kmmio_die_notifier(struct notifier_block *nb, unsigned long val, void *args) struct die_args *arg = args; if (val == DIE_DEBUG && (arg->err & DR_STEP)) - if (post_kmmio_handler(arg->err, arg->regs) == 1) + if (post_kmmio_handler(arg->err, arg->regs) == 1) { + /* + * Reset the BS bit in dr6 (pointed by args->err) to + * denote completion of processing + */ + (*(unsigned long *)ERR_PTR(arg->err)) &= ~DR_STEP; return NOTIFY_STOP; + } return NOTIFY_DONE; } |