diff options
| author |   Dave Airlie <airlied@redhat.com> | 2010-10-06 11:10:48 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-10-06 11:10:48 +1000 |
| commit | fb7ba2114bcd8bb51640c20bc68f89164b29b9ed (patch) | |
| tree | 80b4a779130a477680a72109257fb8c19d66cf22 /arch/m32r/kernel/ptrace.c | |
| parent | Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next (diff) | |
| parent | vmwgfx: Fix fb VRAM pinning failure due to fragmentation (diff) | |
| download | wireguard-linux-fb7ba2114bcd8bb51640c20bc68f89164b29b9ed.tar.xz wireguard-linux-fb7ba2114bcd8bb51640c20bc68f89164b29b9ed.zip | |
Merge remote branch 'korg/drm-fixes' into drm-vmware-next
necessary for some of the vmware fixes to be pushed in.
Conflicts:
drivers/gpu/drm/drm_gem.c
drivers/gpu/drm/i915/intel_fb.c
include/drm/drmP.h
Diffstat (limited to 'arch/m32r/kernel/ptrace.c')
| -rw-r--r-- | arch/m32r/kernel/ptrace.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/m32r/kernel/ptrace.c b/arch/m32r/kernel/ptrace.c index e555091eb97c..0021ade4cba8 100644 --- a/arch/m32r/kernel/ptrace.c +++ b/arch/m32r/kernel/ptrace.c @@ -592,16 +592,17 @@ void user_enable_single_step(struct task_struct *child) if (access_process_vm(child, pc&~3, &insn, sizeof(insn), 0) != sizeof(insn)) - break; + return -EIO; compute_next_pc(insn, pc, &next_pc, child); if (next_pc & 0x80000000) - break; + return -EIO; if (embed_debug_trap(child, next_pc)) - break; + return -EIO; invalidate_cache(); + return 0; } void user_disable_single_step(struct task_struct *child) |