rpms/kernel/devel kernel-2.6.spec, 1.2892, 1.2893 linux-2.6-compile-fixes.patch, 1.120, 1.121 linux-2.6-utrace.patch, 1.46, 1.47 upstream, 1.446, 1.447 linux-2.6-ip6-csum.patch, 1.1, NONE linux-2.6-vm-debug.patch, 1.5, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Dec 29 06:03:24 UTC 2006
Author: davej
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26803
Modified Files:
kernel-2.6.spec linux-2.6-compile-fixes.patch
linux-2.6-utrace.patch upstream
Removed Files:
linux-2.6-ip6-csum.patch linux-2.6-vm-debug.patch
Log Message:
rc2
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2892
retrieving revision 1.2893
diff -u -r1.2892 -r1.2893
--- kernel-2.6.spec 22 Dec 2006 01:37:32 -0000 1.2892
+++ kernel-2.6.spec 29 Dec 2006 06:03:21 -0000 1.2893
@@ -295,8 +295,8 @@
#
# Patches 0 through 100 are meant for core subsystem upgrades
#
-Patch1: patch-2.6.20-rc1.bz2
-Patch2: patch-2.6.20-rc1-git5.bz2
+Patch1: patch-2.6.20-rc2.bz2
+#Patch2: patch-2.6.20-rc1-git5.bz2
Patch3: git-geode.patch
# Patches 10 through 99 are for things that are going upstream really soon.
@@ -334,7 +334,6 @@
Patch326: linux-2.6-ohci-platform-bus.patch
Patch330: linux-2.6-mpc52xx-ata.patch
-Patch331: linux-2.6-efika-before-chrp.patch
# 400 - 499 ia64
@@ -443,7 +442,6 @@
Patch1910: linux-2.6-unexport-symbols.patch
# VM bits.
-Patch2000: linux-2.6-vm-debug.patch
Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch
Patch2005: linux-2.6-mm-prevent-oom-fixes.patch
@@ -458,8 +456,6 @@
Patch2201: linux-2.6-sata-ahci-suspend.patch
Patch2202: linux-2.6-sata-sg_init_one-oops.patch
-Patch2300: linux-2.6-ip6-csum.patch
-
# ACPI bits
#
@@ -727,7 +723,7 @@
# Update to latest upstream.
%patch1 -p1
-%patch2 -p1
+#%patch2 -p1
# Patches 10 through 100 are meant for core subsystem upgrades
@@ -774,17 +770,15 @@
%patch312 -p1
%patch313 -p1
# Big-endian USB support (Celleb, PS3)
-%patch320 -p1
-%patch321 -p1
+#%patch320 -p1
+#%patch321 -p1
%patch322 -p1
# OHCI bus glue rework to allow several at once
-%patch325 -p1
+#%patch325 -p1
# OHCI of_device support
-%patch326 -p1
+#%patch326 -p1
# MPC52xx PATA
%patch330 -p1
-# Probe for Efika before CHRP
-%patch331 -p1
# S390
@@ -966,8 +960,6 @@
#
# VM related fixes.
#
-# Reenable negative pagecount debugging even if CONFIG_DEBUG_VM is off.
-%patch2000 -p1
# Silence GFP_ATOMIC failures.
%patch2001 -p1
# OOM killer enhancements.
@@ -991,8 +983,6 @@
# libata: don't initialize sg in ata_exec_internal() if DMA_NONE
#%patch2202 -p1
-%patch2300 -p1
-
# ACPI patches
#
@@ -1820,6 +1810,9 @@
# - tux.
%changelog
+* Wed Dec 27 2006 Dave Jones <davej at redhat.com>
+- 2.6.20rc2
+
* Thu Dec 21 2006 David Woodhouse <dwmw2 at redhat.com>
- Fix IPv6 checksum handling
- Add MODULE_ALIAS() to pata_mpc52xx driver
@@ -1842,7 +1835,7 @@
- Fix the deleteme handling
- Fix build on platforms without writel_be()
- Fix connector build failure
-
+
* Sun Dec 17 2006 Dave Jones <davej at redhat.com>
- 2.6.20rc1-git5
linux-2.6-compile-fixes.patch:
locks.c | 4 ++++
1 files changed, 4 insertions(+)
Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- linux-2.6-compile-fixes.patch 18 Dec 2006 08:57:32 -0000 1.120
+++ linux-2.6-compile-fixes.patch 29 Dec 2006 06:03:21 -0000 1.121
@@ -1,194 +1,109 @@
-
---- linux-2.6.19.noarch/include/asm-i386/desc.h~ 2006-12-08 06:52:55.000000000 -0500
-+++ linux-2.6.19.noarch/include/asm-i386/desc.h 2006-12-08 06:53:14.000000000 -0500
-@@ -185,6 +185,20 @@ static inline unsigned long get_desc_bas
- return base;
- }
-
-+static inline void set_user_cs(struct desc_struct *desc, unsigned long limit)
-+{
-+ limit = (limit - 1) / PAGE_SIZE;
-+ desc->a = limit & 0xffff;
-+ desc->b = (limit & 0xf0000) | 0x00c0fb00;
-+}
-+
-+#define load_user_cs_desc(cpu, mm) \
-+ get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
-+
-+extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
-+extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
-+extern void arch_flush_exec_range(struct mm_struct *mm);
-+
- #else /* __ASSEMBLY__ */
-
- /*
-@@ -208,20 +222,6 @@ static inline unsigned long get_desc_bas
- shll $16, base; \
- movw idx*8+2(gdt), lo_w;
-
--static inline void set_user_cs(struct desc_struct *desc, unsigned long limit)
--{
-- limit = (limit - 1) / PAGE_SIZE;
-- desc->a = limit & 0xffff;
-- desc->b = (limit & 0xf0000) | 0x00c0fb00;
--}
--
--#define load_user_cs_desc(cpu, mm) \
-- get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
--
--extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
--extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
--extern void arch_flush_exec_range(struct mm_struct *mm);
--
- #endif /* !__ASSEMBLY__ */
-
- #endif
-
-
-drivers/macintosh/via-pmu.c: In function 'pmac_suspend_devices':
-drivers/macintosh/via-pmu.c:2014: error: implicit declaration of function 'pm_prepare_console'
-drivers/macintosh/via-pmu.c: In function 'pmac_wakeup_devices':
-drivers/macintosh/via-pmu.c:2139: error: implicit declaration of function 'pm_restore_console'
-
-Signed-off-by: Dave Jones <davej at redhat.com>
-
---- linux-2.6.19.noarch/drivers/macintosh/via-pmu.c~ 2006-12-12 11:18:03.000000000 -0500
-+++ linux-2.6.19.noarch/drivers/macintosh/via-pmu.c 2006-12-12 11:18:33.000000000 -0500
-@@ -44,6 +44,7 @@
- #include <linux/sysdev.h>
- #include <linux/freezer.h>
- #include <linux/syscalls.h>
-+#include <linux/suspend.h>
- #include <linux/cpu.h>
- #include <asm/prom.h>
- #include <asm/machdep.h>
-
-
-
-drivers/ieee1394/sbp2.c: In function 'sbp2_prep_command_orb_sg':
-drivers/ieee1394/sbp2.c:1473: error: implicit declaration of function 'sg_dma_len'
-drivers/ieee1394/sbp2.c:1474: error: implicit declaration of function 'sg_dma_address'
-
-Signed-off-by: Dave Jones <davej at redhat.com>
-
---- linux-2.6.19.noarch/include/asm-ia64/scatterlist.h~ 2006-12-12 12:35:24.000000000 -0500
-+++ linux-2.6.19.noarch/include/asm-ia64/scatterlist.h 2006-12-12 12:35:47.000000000 -0500
-@@ -25,4 +25,12 @@ struct scatterlist {
- */
- #define ISA_DMA_THRESHOLD 0xffffffff
-
-+/* These macros should be used after a pci_map_sg call has been done
-+ * to get bus addresses of each of the SG entries and their lengths.
-+ * You should only work with the number of sg entries pci_map_sg
-+ * returns.
-+ */
-+#define sg_dma_address(sg) ((sg)->dma_address)
-+#define sg_dma_len(sg) ((sg)->dma_length)
-+
- #endif /* _ASM_IA64_SCATTERLIST_H */
-
-diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
-index 1cd5323..ec7bb5b 100644
---- a/include/asm-powerpc/io.h
-+++ b/include/asm-powerpc/io.h
-@@ -732,6 +732,7 @@ static inline void * bus_to_virt(unsigned long address)
-
- #endif /* CONFIG_PPC32 */
-
-+#define eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),(void __force *)(void __iomem *)(b),(c),(d))
-
- #endif /* __KERNEL__ */
-
---- linux-2.6.19.ppc/sound/oss/dmasound/tas3004.c~ 2006-11-29 21:57:37.000000000 +0000
-+++ linux-2.6.19.ppc/sound/oss/dmasound/tas3004.c 2006-12-13 16:40:26.000000000 +0000
-@@ -48,6 +48,7 @@ struct tas3004_data_t {
- int output_id;
- int speaker_id;
- struct tas_drce_t drce_state;
-+ struct work_struct device_change;
- };
-
- #define MAKE_TIME(sec,usec) (((sec)<<12) + (50000+(usec/10)*(1<<12))/100000)
-@@ -914,15 +915,14 @@ tas3004_update_device_parameters(struct
- }
-
- static void
--tas3004_device_change_handler(void *self)
-+tas3004_device_change_handler(struct work_struct *work)
- {
-+ void *self = container_of(work, struct tas3004_data_t, device_change);
- if (!self) return;
-
- tas3004_update_device_parameters((struct tas3004_data_t *)self);
- }
-
--static struct work_struct device_change;
--
- static int
- tas3004_output_device_change( struct tas3004_data_t *self,
- int device_id,
-@@ -933,7 +933,7 @@ tas3004_output_device_change( struct tas
- self->output_id=output_id;
- self->speaker_id=speaker_id;
-
-- schedule_work(&device_change);
-+ schedule_work(&self->device_change);
-
- return 0;
- }
-@@ -1112,7 +1112,7 @@ tas3004_init(struct i2c_client *client)
- tas3004_write_register(self, TAS3004_REG_MCR2, &mcr2, WRITE_SHADOW);
- tas3004_write_register(self, TAS3004_REG_DRC, drce_init, WRITE_SHADOW);
-
-- INIT_WORK(&device_change, tas3004_device_change_handler, self);
-+ INIT_WORK(&self->device_change, tas3004_device_change_handler);
- return 0;
- }
-
---- linux-2.6.19.ppc/sound/oss/dmasound/tas3001c.c~ 2006-11-29 21:57:37.000000000 +0000
-+++ linux-2.6.19.ppc/sound/oss/dmasound/tas3001c.c 2006-12-13 16:38:10.000000000 +0000
-@@ -50,6 +50,7 @@ struct tas3001c_data_t {
- int output_id;
- int speaker_id;
- struct tas_drce_t drce_state;
-+ struct work_struct device_change;
- };
-
-
-@@ -667,14 +668,13 @@ tas3001c_update_device_parameters(struct
- }
-
- static void
--tas3001c_device_change_handler(void *self)
-+tas3001c_device_change_handler(struct work_struct *work)
- {
-+ void *self = container_of(work, struct tas3001c_data_t, device_change);
- if (self)
- tas3001c_update_device_parameters(self);
- }
-
--static struct work_struct device_change;
--
- static int
- tas3001c_output_device_change( struct tas3001c_data_t *self,
- int device_id,
-@@ -685,7 +685,7 @@ tas3001c_output_device_change( struct ta
- self->output_id=output_id;
- self->speaker_id=speaker_id;
-
-- schedule_work(&device_change);
-+ schedule_work(&self->device_change);
- return 0;
- }
-
-@@ -823,7 +823,7 @@ tas3001c_init(struct i2c_client *client)
- tas3001c_write_biquad_shadow(self, i, j,
- &tas3001c_eq_unity);
-
-- INIT_WORK(&device_change, tas3001c_device_change_handler, self);
-+ INIT_WORK(&self->device_change, tas3001c_device_change_handler);
- return 0;
- }
+#
+# Small compile fixes (For more involved fixes, please use a separate patch).
+#
+# Please add the errors from gcc before the diffs to save others having
+# to do a compile to figure out what your diff is fixing. Thanks.
+#
+
+#--- linux-2.6.19.noarch/include/asm-i386/desc.h~ 2006-12-08 06:52:55.000000000 -0500
+#+++ linux-2.6.19.noarch/include/asm-i386/desc.h 2006-12-08 06:53:14.000000000 -0500
+#@@ -185,6 +185,20 @@ static inline unsigned long get_desc_bas
+# return base;
+# }
+#
+#+static inline void set_user_cs(struct desc_struct *desc, unsigned long limit)
+#+{
+#+ limit = (limit - 1) / PAGE_SIZE;
+#+ desc->a = limit & 0xffff;
+#+ desc->b = (limit & 0xf0000) | 0x00c0fb00;
+#+}
+#+
+#+#define load_user_cs_desc(cpu, mm) \
+#+ get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
+#+
+#+extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
+#+extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
+#+extern void arch_flush_exec_range(struct mm_struct *mm);
+#+
+# #else /* __ASSEMBLY__ */
+#
+# /*
+#@@ -208,20 +222,6 @@ static inline unsigned long get_desc_bas
+# shll $16, base; \
+# movw idx*8+2(gdt), lo_w;
+#
+#-static inline void set_user_cs(struct desc_struct *desc, unsigned long limit)
+#-{
+#- limit = (limit - 1) / PAGE_SIZE;
+#- desc->a = limit & 0xffff;
+#- desc->b = (limit & 0xf0000) | 0x00c0fb00;
+#-}
+#-
+#-#define load_user_cs_desc(cpu, mm) \
+#- get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
+#-
+#-extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
+#-extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
+#-extern void arch_flush_exec_range(struct mm_struct *mm);
+#-
+# #endif /* !__ASSEMBLY__ */
+#
+# #endif
+
+
+#drivers/macintosh/via-pmu.c: In function 'pmac_suspend_devices':
+#drivers/macintosh/via-pmu.c:2014: error: implicit declaration of function 'pm_prepare_console'
+#drivers/macintosh/via-pmu.c: In function 'pmac_wakeup_devices':
+#drivers/macintosh/via-pmu.c:2139: error: implicit declaration of function 'pm_restore_console'
+#
+#Signed-off-by: Dave Jones <davej at redhat.com>
+#
+#--- linux-2.6.19.noarch/drivers/macintosh/via-pmu.c~ 2006-12-12 11:18:03.000000000 -0500
+#+++ linux-2.6.19.noarch/drivers/macintosh/via-pmu.c 2006-12-12 11:18:33.000000000 -0500
+#@@ -44,6 +44,7 @@
+# #include <linux/sysdev.h>
+# #include <linux/freezer.h>
+# #include <linux/syscalls.h>
+#+#include <linux/suspend.h>
+# #include <linux/cpu.h>
+# #include <asm/prom.h>
+# #include <asm/machdep.h>
+
+
+
+#drivers/ieee1394/sbp2.c: In function 'sbp2_prep_command_orb_sg':
+#drivers/ieee1394/sbp2.c:1473: error: implicit declaration of function 'sg_dma_len'
+#drivers/ieee1394/sbp2.c:1474: error: implicit declaration of function 'sg_dma_address'
+#
+#Signed-off-by: Dave Jones <davej at redhat.com>
+#
+#--- linux-2.6.19.noarch/include/asm-ia64/scatterlist.h~ 2006-12-12 12:35:24.000000000 -0500
+#+++ linux-2.6.19.noarch/include/asm-ia64/scatterlist.h 2006-12-12 12:35:47.000000000 -0500
+#@@ -25,4 +25,12 @@ struct scatterlist {
+# */
+# #define ISA_DMA_THRESHOLD 0xffffffff
+#
+#+/* These macros should be used after a pci_map_sg call has been done
+#+ * to get bus addresses of each of the SG entries and their lengths.
+#+ * You should only work with the number of sg entries pci_map_sg
+#+ * returns.
+#+ */
+#+#define sg_dma_address(sg) ((sg)->dma_address)
+#+#define sg_dma_len(sg) ((sg)->dma_length)
+#+
+# #endif /* _ASM_IA64_SCATTERLIST_H */
+
+#diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
+#index 1cd5323..ec7bb5b 100644
+#--- a/include/asm-powerpc/io.h
+#+++ b/include/asm-powerpc/io.h
+#@@ -732,6 +732,7 @@ static inline void * bus_to_virt(unsigned long address)
+#
+# #endif /* CONFIG_PPC32 */
+#
+#+#define eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),(void __force *)(void __iomem *)(b),(c),(d))
+#
+# #endif /* __KERNEL__ */
--- linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c~ 2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c 2006-12-13 16:53:11.000000000 +0000
@@ -216,19 +131,3 @@
}
#endif
-diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
-index 5e7cd45..27f377b 100644
---- a/drivers/connector/connector.c
-+++ b/drivers/connector/connector.c
-@@ -135,9 +135,8 @@ static int cn_call_callback(struct cn_msg *msg, void (*destruct_data)(void *), v
- spin_lock_bh(&dev->cbdev->queue_lock);
- list_for_each_entry(__cbq, &dev->cbdev->queue_list, callback_entry) {
- if (cn_cb_equal(&__cbq->id.id, &msg->id)) {
-- if (likely(!test_bit(WORK_STRUCT_PENDING,
-- &__cbq->work.work.management) &&
-- __cbq->data.ddata == NULL)) {
-+ if (likely(!work_pending(&__cbq->work.work) &&
-+ __cbq->data.ddata == NULL)) {
- __cbq->data.callback_priv = msg;
-
- __cbq->data.ddata = data;
linux-2.6-utrace.patch:
Documentation/utrace.txt | 579 +++++++++++
arch/alpha/kernel/asm-offsets.c | 2
arch/alpha/kernel/entry.S | 4
arch/arm/kernel/ptrace.c | 36
arch/arm26/kernel/ptrace.c | 32
arch/frv/kernel/ptrace.c | 15
arch/i386/kernel/entry.S | 7
arch/i386/kernel/i387.c | 143 +-
arch/i386/kernel/process.c | 3
arch/i386/kernel/ptrace.c | 863 +++++++++-------
arch/i386/kernel/signal.c | 37
arch/i386/kernel/vm86.c | 7
arch/ia64/ia32/ia32_entry.S | 2
arch/ia64/ia32/sys_ia32.c | 537 ++++++++++
arch/ia64/kernel/asm-offsets.c | 2
arch/ia64/kernel/fsys.S | 16
arch/ia64/kernel/mca.c | 2
arch/ia64/kernel/ptrace.c | 1680 ++++++++++++++++----------------
arch/ia64/kernel/signal.c | 4
arch/mips/kernel/ptrace.c | 21
arch/mips/kernel/sysirix.c | 2
arch/powerpc/kernel/Makefile | 4
arch/powerpc/kernel/asm-offsets.c | 2
arch/powerpc/kernel/process.c | 5
arch/powerpc/kernel/ptrace-common.h | 161 ---
arch/powerpc/kernel/ptrace.c | 959 +++++++++++-------
arch/powerpc/kernel/ptrace32.c | 436 --------
arch/powerpc/kernel/signal_32.c | 55 +
arch/powerpc/kernel/signal_64.c | 3
arch/powerpc/kernel/sys_ppc32.c | 5
arch/powerpc/lib/sstep.c | 3
arch/ppc/kernel/asm-offsets.c | 2
arch/s390/kernel/Makefile | 2
arch/s390/kernel/compat_linux.c | 3
arch/s390/kernel/compat_signal.c | 5
arch/s390/kernel/process.c | 3
arch/s390/kernel/ptrace.c | 1073 +++++++++-----------
arch/s390/kernel/signal.c | 3
arch/s390/kernel/traps.c | 6
arch/sparc64/kernel/Makefile | 2
arch/sparc64/kernel/binfmt_aout32.c | 2
arch/sparc64/kernel/entry.S | 6
arch/sparc64/kernel/process.c | 3
arch/sparc64/kernel/ptrace.c | 1224 ++++++++++++-----------
arch/sparc64/kernel/signal.c | 2
arch/sparc64/kernel/signal32.c | 2
arch/sparc64/kernel/sys_sparc32.c | 3
arch/sparc64/kernel/systbls.S | 4
arch/x86_64/ia32/fpu32.c | 92 +
arch/x86_64/ia32/ia32_aout.c | 6
arch/x86_64/ia32/ia32_signal.c | 7
arch/x86_64/ia32/ia32entry.S | 2
arch/x86_64/ia32/ptrace32.c | 723 +++++++++----
arch/x86_64/ia32/sys_ia32.c | 5
arch/x86_64/kernel/process.c | 5
arch/x86_64/kernel/ptrace.c | 657 +++++++-----
arch/x86_64/kernel/signal.c | 28
arch/x86_64/kernel/traps.c | 8
arch/x86_64/mm/fault.c | 4
drivers/connector/cn_proc.c | 4
fs/binfmt_aout.c | 6
fs/binfmt_elf.c | 6
fs/binfmt_elf_fdpic.c | 7
fs/binfmt_flat.c | 3
fs/binfmt_som.c | 2
fs/exec.c | 11
fs/proc/array.c | 12
fs/proc/base.c | 17
include/asm-i386/i387.h | 13
include/asm-i386/signal.h | 4
include/asm-i386/thread_info.h | 7
include/asm-i386/tracehook.h | 49
include/asm-ia64/elf.h | 24
include/asm-ia64/tracehook.h | 83 +
include/asm-powerpc/tracehook.h | 80 +
include/asm-s390/tracehook.h | 53 +
include/asm-sparc64/tracehook.h | 44
include/asm-x86_64/fpu32.h | 3
include/asm-x86_64/thread_info.h | 3
include/asm-x86_64/tracehook.h | 54 +
include/linux/init_task.h | 3
include/linux/ptrace.h | 224 +++-
include/linux/sched.h | 25
include/linux/tracehook.h | 707 +++++++++++++
include/linux/utrace.h | 504 +++++++++
init/Kconfig | 29
kernel/Makefile | 1
kernel/exit.c | 249 +---
kernel/fork.c | 62 -
kernel/ptrace.c | 1767 ++++++++++++++++++++++++++++------
kernel/signal.c | 211 ----
kernel/sys.c | 2
kernel/timer.c | 6
kernel/tsacct.c | 2
kernel/utrace.c | 1861 ++++++++++++++++++++++++++++++++++++
security/selinux/hooks.c | 54 -
security/selinux/include/objsec.h | 1
97 files changed, 10643 insertions(+), 5059 deletions(-)
Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- linux-2.6-utrace.patch 24 Dec 2006 00:03:12 -0000 1.46
+++ linux-2.6-utrace.patch 29 Dec 2006 06:03:21 -0000 1.47
@@ -5313,9 +5313,9 @@
{
/* We don't want people slaying init. */
if (p->exit_signal != -1)
-@@ -606,35 +605,14 @@ reparent_thread(struct task_struct *p, s
- group_send_sig_info(p->pdeath_signal, SEND_SIG_NOINFO, p);
-
+@@ -597,49 +597,21 @@ static void
+ reparent_thread(struct task_struct *p, struct task_struct *father)
+ {
/* Move the child from its dying parent to the new one. */
- if (unlikely(traced)) {
- /* Preserve ptrace links if someone else is tracing this child. */
@@ -5330,15 +5330,8 @@
- remove_parent(p);
- p->parent = p->real_parent;
- add_parent(p);
-+ list_move_tail(&p->sibling, &p->parent->children);
-
-- /* If we'd notified the old parent about this child's death,
-- * also notify the new parent.
-- */
-- if (p->exit_state == EXIT_ZOMBIE && p->exit_signal != -1 &&
-- thread_group_empty(p))
-- do_notify_parent(p, p->exit_signal);
-- else if (p->state == TASK_TRACED) {
+-
+- if (p->state == TASK_TRACED) {
- /*
- * If it was at a trace stop, turn it into
- * a normal stop since it's no longer being
@@ -5347,15 +5340,35 @@
- ptrace_untrace(p);
- }
- }
-+ /* If we'd notified the old parent about this child's death,
-+ * also notify the new parent.
-+ */
+-
+- /* If this is a threaded reparent there is no need to
+- * notify anyone anything has happened.
+- */
+- if (p->real_parent->group_leader == father->group_leader)
+- return;
++ list_move_tail(&p->sibling, &p->parent->children);
+
+ /* We don't want people slaying init. */
+ if (p->exit_signal != -1)
+ p->exit_signal = SIGCHLD;
+-
++
+ if (p->pdeath_signal)
+ /* We already hold the tasklist_lock here. */
+ group_send_sig_info(p->pdeath_signal, SEND_SIG_NOINFO, p);
+
+ /* If we'd notified the old parent about this child's death,
+- * also notify the new parent.
+- */
+- if (!traced && p->exit_state == EXIT_ZOMBIE &&
+- p->exit_signal != -1 && thread_group_empty(p))
++ * also notify the new parent.
++ */
+ if (p->exit_state == EXIT_ZOMBIE && p->exit_signal != -1 &&
+ thread_group_empty(p))
-+ do_notify_parent(p, p->exit_signal);
+ do_notify_parent(p, p->exit_signal);
/*
- * process group orphan check
@@ -662,7 +640,7 @@ reparent_thread(struct task_struct *p, s
* space.
*/
@@ -8321,14 +8334,13 @@
case DS:
case ES:
case GS:
-@@ -135,10 +136,12 @@ static unsigned long getreg(struct task_
+@@ -136,9 +136,11 @@ static unsigned long getreg(struct task_
retval = 0xffff;
/* fall through */
default:
+ fetch:
if (regno > ES*4)
regno -= 1*4;
- regno = regno - sizeof(struct pt_regs);
retval &= get_stack_long(child, regno);
+ break;
}
Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -r1.446 -r1.447
--- upstream 18 Dec 2006 03:37:52 -0000 1.446
+++ upstream 29 Dec 2006 06:03:22 -0000 1.447
@@ -1,3 +1,2 @@
linux-2.6.19.tar.bz2
-patch-2.6.20-rc1.bz2
-patch-2.6.20-rc1-git5.bz2
+patch-2.6.20-rc2.bz2
--- linux-2.6-ip6-csum.patch DELETED ---
--- linux-2.6-vm-debug.patch DELETED ---
More information about the fedora-cvs-commits
mailing list