rpms/kernel/devel patch-2.6.30-git14.bz2.sign, NONE, 1.1 .cvsignore, 1.1080, 1.1081 config-generic, 1.289, 1.290 config-powerpc64, 1.32, 1.33 kernel.spec, 1.1575, 1.1576 linux-2.6-utrace.patch, 1.114, 1.115 sources, 1.1038, 1.1039 upstream, 1.952, 1.953 patch-2.6.30-git13.bz2.sign, 1.1, NONE
Kyle McMartin
kyle at fedoraproject.org
Fri Jun 19 22:07:06 UTC 2009
- Previous message (by thread): rpms/kernel/devel kernel.spec, 1.1574, 1.1575 via-hwmon-temp-sensor.patch, 1.2, 1.3 via-sdmmc.patch, 1.4, 1.5 via-padlock-10-enable-64bit.patch, 1.1, NONE via-padlock-20-add-x86-dependency.patch, 1.1, NONE via-rng-enable-64bit.patch, 1.1, NONE
- Next message (by thread): rpms/kernel/devel linux-2.6-tip.git-203abd67b75f7714ce98ab0cdbd6cfd7ad79dec4.patch, NONE, 1.1 kernel.spec, 1.1576, 1.1577
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11701
Modified Files:
.cvsignore config-generic config-powerpc64 kernel.spec
linux-2.6-utrace.patch sources upstream
Added Files:
patch-2.6.30-git14.bz2.sign
Removed Files:
patch-2.6.30-git13.bz2.sign
Log Message:
* Fri Jun 19 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.13.rc0.git14
- 2.6.30-git14
--- NEW FILE patch-2.6.30-git14.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBKOtdAyGugalF9Dw4RAkgiAKCLf1VkjqCw6cyCrfItj+0SO5JI2QCfQHD2
vTtxORZcu3xKX1fWXID5Cq0=
=uWG8
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1080
retrieving revision 1.1081
diff -u -p -r1.1080 -r1.1081
--- .cvsignore 18 Jun 2009 19:05:53 -0000 1.1080
+++ .cvsignore 19 Jun 2009 22:06:33 -0000 1.1081
@@ -5,4 +5,4 @@ kernel-2.6.*.config
temp-*
kernel-2.6.30
linux-2.6.30.tar.bz2
-patch-2.6.30-git13.bz2
+patch-2.6.30-git14.bz2
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -p -r1.289 -r1.290
--- config-generic 18 Jun 2009 19:05:53 -0000 1.289
+++ config-generic 19 Jun 2009 22:06:33 -0000 1.290
@@ -2192,6 +2192,7 @@ CONFIG_RTC_DRV_V3020=m
CONFIG_RTC_DRV_STK17TA8=m
# CONFIG_RTC_DRV_S35390A is not set
CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
CONFIG_RTC_DRV_DS1286=m
CONFIG_RTC_DRV_M48T35=m
CONFIG_RTC_DRV_BQ4802=m
@@ -4002,4 +4003,7 @@ CONFIG_IEEE802154=m
CONFIG_IEEE802154_DRIVERS=m
CONFIG_IEEE802154_FAKEHARD=m
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc64,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- config-powerpc64 18 Jun 2009 19:05:53 -0000 1.32
+++ config-powerpc64 19 Jun 2009 22:06:34 -0000 1.33
@@ -157,6 +157,7 @@ CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_SPU_TRACE=m
CONFIG_MTD_NAND_PASEMI=m
CONFIG_EDAC_CELL=m
+CONFIG_EDAC_CPC925=m
CONFIG_FRAME_WARN=2048
CONFIG_PHYP_DUMP=y
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1575
retrieving revision 1.1576
diff -u -p -r1.1575 -r1.1576
--- kernel.spec 19 Jun 2009 21:49:01 -0000 1.1575
+++ kernel.spec 19 Jun 2009 22:06:34 -0000 1.1576
@@ -58,7 +58,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 13
+%define gitrev 14
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -1081,7 +1081,7 @@ ApplyPatch linux-2.6-tracehook.patch
ApplyPatch linux-2.6-utrace.patch
# enable sysrq-c on all kernels, not only kexec
-ApplyPatch linux-2.6-sysrq-c.patch
+#ApplyPatch linux-2.6-sysrq-c.patch
#ApplyPatch linux-2.6-missing-rfc2465-stats.patch
@@ -1817,6 +1817,9 @@ fi
# and build.
%changelog
+* Fri Jun 19 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.13.rc0.git14
+- 2.6.30-git14
+
* Fri Jun 19 2009 Chuck Ebbert <cebbert at redhat.com>
- Fix up the via-sdmmc and via-hwmon-temp-sensor patches.
- Drop VIA Padlock patches merged upstream:
@@ -1846,7 +1849,7 @@ fi
- CONFIG_RCU_FANOUT=32
- powerpc64:
- CONFIG_RCU_FANOUT=64
- - CONFIG_PERF_COUNTERS is not set (broken on ppc64)
+ - CONFIG_PERF_COUNTERS=y
- s390x:
- CONFIG_RCU_FANOUT=64
- CONFIG_SECCOMP=y
linux-2.6-utrace.patch:
Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- linux-2.6-utrace.patch 18 Jun 2009 19:05:54 -0000 1.114
+++ linux-2.6-utrace.patch 19 Jun 2009 22:06:34 -0000 1.115
@@ -629,10 +629,10 @@ index 725a650..e299a63 100644
if (p->files)
fdt = files_fdtable(p->files);
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
-index 28b1f30..edf3369 100644
+index 5368fbd..aecd24e 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
-@@ -179,6 +179,7 @@ extern struct cred init_cred;
+@@ -167,6 +167,7 @@ extern struct cred init_cred;
[PIDTYPE_SID] = INIT_PID_LINK(PIDTYPE_SID), \
}, \
.dirties = INIT_PROP_LOCAL_SINGLE(dirties), \
@@ -641,7 +641,7 @@ index 28b1f30..edf3369 100644
INIT_PERF_COUNTERS(tsk) \
INIT_TRACE_IRQFLAGS \
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 4896fdf..0633dfd 100644
+index 4d07542..2060aa1 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -59,6 +59,7 @@ struct sched_param {
@@ -652,7 +652,7 @@ index 4896fdf..0633dfd 100644
#include <asm/system.h>
#include <asm/page.h>
-@@ -1314,6 +1315,11 @@ struct task_struct {
+@@ -1313,6 +1314,11 @@ struct task_struct {
#endif
seccomp_t seccomp;
@@ -665,7 +665,7 @@ index 4896fdf..0633dfd 100644
u32 parent_exec_id;
u32 self_exec_id;
diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
-index 6a168b9..d59e159 100644
+index 7c2bfd9..a91d9a4 100644
--- a/include/linux/tracehook.h
+++ b/include/linux/tracehook.h
@@ -49,6 +49,7 @@
@@ -1635,10 +1635,10 @@ index 0000000..aba7e09
+
+#endif /* linux/utrace_struct.h */
diff --git a/init/Kconfig b/init/Kconfig
-index c649657..1be4b01 100644
+index 1ce05a4..f720929 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1184,6 +1184,15 @@ config STOP_MACHINE
+@@ -1191,6 +1191,15 @@ config STOP_MACHINE
help
Need stop_machine() primitive.
@@ -1655,19 +1655,19 @@ index c649657..1be4b01 100644
config PREEMPT_NOTIFIERS
diff --git a/kernel/Makefile b/kernel/Makefile
-index 90b53f6..5f695ca 100644
+index 0a32cb2..2518707 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
-@@ -68,6 +68,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
+@@ -69,6 +69,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
obj-$(CONFIG_RESOURCE_COUNTERS) += res_counter.o
obj-$(CONFIG_STOP_MACHINE) += stop_machine.o
obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o
+obj-$(CONFIG_UTRACE) += utrace.o
obj-$(CONFIG_AUDIT) += audit.o auditfilter.o
obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
- obj-$(CONFIG_AUDIT_TREE) += audit_tree.o
+ obj-$(CONFIG_GCOV_KERNEL) += gcov/
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index f6d8b8c..8a9f59e 100644
+index 61c78b2..b96f9f1 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -16,6 +16,7 @@
@@ -1693,29 +1693,87 @@ index f6d8b8c..8a9f59e 100644
int ptrace_attach(struct task_struct *task)
{
int retval;
-@@ -203,6 +212,11 @@ repeat:
- goto repeat;
- }
+@@ -186,6 +195,13 @@ int ptrace_attach(struct task_struct *task)
+ goto out;
+ task_lock(task);
++
+ if (exclude_ptrace(task)) {
+ retval = -EBUSY;
-+ goto bad;
++ task_unlock(task);
++ goto unlock_creds;
+ }
+
- if (!task->mm)
- goto bad;
- /* the same process cannot be attached many times */
-@@ -581,7 +595,9 @@ int ptrace_traceme(void)
- */
- repeat:
- task_lock(current);
-- if (!(current->ptrace & PT_PTRACED)) {
+ retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH);
+ task_unlock(task);
+ if (retval)
+@@ -577,7 +593,65 @@ int ptrace_request(struct task_struct *child, long request,
+ return ret;
+ }
+
+-static struct task_struct *ptrace_get_task_struct(pid_t pid)
++/**
++ * ptrace_traceme -- helper for PTRACE_TRACEME
++ *
++ * Performs checks and sets PT_PTRACED.
++ * Should be used by all ptrace implementations for PTRACE_TRACEME.
++ */
++int ptrace_traceme(void)
++{
++ int ret = -EPERM;
++
++ /*
++ * Are we already being traced?
++ */
++repeat:
++ task_lock(current);
+ if (exclude_ptrace(current)) {
+ ret = -EBUSY;
+ } else if (!(current->ptrace & PT_PTRACED)) {
- /*
- * See ptrace_attach() comments about the locking here.
- */
++ /*
++ * See ptrace_attach() comments about the locking here.
++ */
++ unsigned long flags;
++ if (!write_trylock_irqsave(&tasklist_lock, flags)) {
++ task_unlock(current);
++ do {
++ cpu_relax();
++ } while (!write_can_lock(&tasklist_lock));
++ goto repeat;
++ }
++
++ ret = security_ptrace_traceme(current->parent);
++
++ /*
++ * Check PF_EXITING to ensure ->real_parent has not passed
++ * exit_ptrace(). Otherwise we don't report the error but
++ * pretend ->real_parent untraces us right after return.
++ */
++ if (!ret && !(current->real_parent->flags & PF_EXITING)) {
++ current->ptrace |= PT_PTRACED;
++ __ptrace_link(current, current->real_parent);
++ }
++
++ write_unlock_irqrestore(&tasklist_lock, flags);
++ }
++ task_unlock(current);
++ return ret;
++}
++
++/**
++ * ptrace_get_task_struct -- grab a task struct reference for ptrace
++ * @pid: process id to grab a task_struct reference of
++ *
++ * This function is a helper for ptrace implementations. It checks
++ * permissions and then grabs a task struct for use of the actual
++ * ptrace implementation.
++ *
++ * Returns the task_struct for @pid or an ERR_PTR() on failure.
++ */
++struct task_struct *ptrace_get_task_struct(pid_t pid)
+ {
+ struct task_struct *child;
+
diff --git a/kernel/utrace.c b/kernel/utrace.c
new file mode 100644
index 0000000..74b5fc5
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1038
retrieving revision 1.1039
diff -u -p -r1.1038 -r1.1039
--- sources 18 Jun 2009 19:05:54 -0000 1.1038
+++ sources 19 Jun 2009 22:06:35 -0000 1.1039
@@ -1,2 +1,2 @@
7a80058a6382e5108cdb5554d1609615 linux-2.6.30.tar.bz2
-e0a66ed3d46ae936c0fb57e143e12a25 patch-2.6.30-git13.bz2
+803a66d630550b3b0a5ce1dbd88fa7c7 patch-2.6.30-git14.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.952
retrieving revision 1.953
diff -u -p -r1.952 -r1.953
--- upstream 18 Jun 2009 19:05:54 -0000 1.952
+++ upstream 19 Jun 2009 22:06:35 -0000 1.953
@@ -1,2 +1,2 @@
linux-2.6.30.tar.bz2
-patch-2.6.30-git13.bz2
+patch-2.6.30-git14.bz2
--- patch-2.6.30-git13.bz2.sign DELETED ---
- Previous message (by thread): rpms/kernel/devel kernel.spec, 1.1574, 1.1575 via-hwmon-temp-sensor.patch, 1.2, 1.3 via-sdmmc.patch, 1.4, 1.5 via-padlock-10-enable-64bit.patch, 1.1, NONE via-padlock-20-add-x86-dependency.patch, 1.1, NONE via-rng-enable-64bit.patch, 1.1, NONE
- Next message (by thread): rpms/kernel/devel linux-2.6-tip.git-203abd67b75f7714ce98ab0cdbd6cfd7ad79dec4.patch, NONE, 1.1 kernel.spec, 1.1576, 1.1577
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list