The patch titled
consolidate-sys_ptrace-x86-fix
has been added to the -mm tree. Its filename is
consolidate-sys_ptrace-x86-fix.patch
Patches currently in -mm which might be from [EMAIL PROTECTED] are
seclvl-use-securityfs-tidy.patch
git-net-gregkh-i2c-w1-netlink-callbacks-fix.patch
ieee80211_module-build-fixes.patch
ieee80211_tx-build-fix.patch
ieee80211_rx-build-fix.patch
ieee80211_crypt-build-fix.patch
ieee80211_crypt_ccmp-build-fix.patch
ieee80211_crypt_wep-build-fix.patch
ieee80211_crypt_tkip-build-fix.patch
mbio_bus-pm_message_t-fix.patch
ocfs2-prep.patch
git-scsi-iscsi-vs-git-net.patch
git-net-vs-iscsi-fix.patch
page-fault-patches-optional-page_lock-acquisition-in-vs-use-mm_counter-macros-for-nr_pte-since-its-also-under-ptl.patch
x86-ptep-clear-optimization-fix.patch
ipw2200-build-fix.patch
security-enable-atomic-inode-security-labeling-use-kstrdup.patch
ext2-enable-atomic-inode-security-labeling-fix.patch
ext3-enable-atomic-inode-security-labeling-fix.patch
x86-automatically-enable-bigsmp-when-we-have-more-than-8-cpus-2-tidy.patch
i386-inline-asm-cleanup-kexec-fix.patch
i386-arch-cleanup-seralize-msr-fix.patch
i386-inline-assembler-cleanup-encapsulate-descriptor-and-task-register-management-fix.patch
i386--typecheck-and-optimize-base-and-limit-accessors-fix.patch
i386--typecheck-and-optimize-base-and-limit-accessors-fix-tidy.patch
i386-boottime-for_each_cpu-broken-fix.patch
x86_64-div-by-zero-fix.patch
swsusp-switch-pm_message_t-to-struct-pmac_zilog-fix.patch
swsusp-switch-pm_message_t-to-struct-ppc32-fixes.patch
swsusp-switch-pm_message_t-to-struct-chipsfb-fixes.patch
detect-soft-lockups-export-touch_softlockup_watchdog.patch
pselect-ppoll-system-calls-tidy.patch
pselect-ppoll-system-calls-sigset_t-fix-2.patch
pselect-ppoll-system-calls-sigset_t-fix-3.patch
provide-better-printk-support-for-smp-machines-tidy.patch
make-kmalloc-fail-for-swapped-size--gfp-flags-fix.patch
make-kmalloc-fail-for-swapped-size--gfp-flags-aic-fix.patch
radix_tag_get-differentiate-between-no-present-node-and-tag-unset-cases-fix.patch
disk-quotas-fail-when-etc-mtab-is-symlinked-to-proc-mounts-tidy.patch
fix-cramfs-making-duplicate-entries-in-inode-cache-tidy.patch
consolidate-sys_ptrace-x86-fix.patch
serial-console-touch-nmi-watchdog.patch
dmi-add-onboard-devices-discovery-fix.patch
smsc-ircc2-pm-cleanup-do-not-close-device-when-suspending-fixes.patch
dlm-use-configfs-fix.patch
debug-preempt-tracing-fix.patch
debug-preempt-tracing-fix-2.patch
debug-preempt-tracing-fix-3.patch
ingo-nfs-stuff-fix.patch
nr_blockdev_pages-in_interrupt-warning.patch
sysfs-crash-debugging.patch
device-suspend-debug.patch
reiser4-swsusp-build-fix.patch
reiser4-printk-warning-fix.patch
reiser4-mm-remove-pg_highmem-fix.patch
fbdev-resurrect-hooks-to-get-edid-from-firmware-fix.patch
timeh-remove-ifdefs.patch
net-fix-up-schedule_timeout-usage-fix.patch
net-fix-up-schedule_timeout-usage-fix-2.patch
parport-fix-up-schedule_timeout-usage-fix.patch
drivers-usb-fix-up-schedule_timeout-usage-fix.patch
From: Andrew Morton <[EMAIL PROTECTED]>
arch/i386/kernel/ptrace.c: In function `arch_ptrace':
arch/i386/kernel/ptrace.c:437: label `out_tsk' used but not defined
I fixed this in the previous version of the patch :(
Cc: Christoph Hellwig <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
arch/i386/kernel/ptrace.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff -puN arch/i386/kernel/ptrace.c~consolidate-sys_ptrace-x86-fix
arch/i386/kernel/ptrace.c
--- devel/arch/i386/kernel/ptrace.c~consolidate-sys_ptrace-x86-fix
2005-08-30 19:06:57.000000000 -0700
+++ devel-akpm/arch/i386/kernel/ptrace.c 2005-08-30 19:06:57.000000000
-0700
@@ -434,7 +434,7 @@ long arch_ptrace(struct task_struct *chi
data &= ~DR_CONTROL_RESERVED;
for(i=0; i<4; i++)
if ((0x5f54 >> ((data >> (16 + 4*i))
& 0xf)) & 1)
- goto out_tsk;
+ goto out;
}
addr -= (long) &dummy->u_debugreg;
@@ -596,7 +596,7 @@ long arch_ptrace(struct task_struct *chi
ret = ptrace_request(child, request, addr, data);
break;
}
-
+out:
return ret;
}
_
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
