rpms/kernel/devel patch-2.6.30-rc4-git3.bz2.sign, NONE, 1.1 .cvsignore, 1.1060, 1.1061 config-generic, 1.282, 1.283 kernel.spec, 1.1539, 1.1540 linux-2.6-utrace.patch, 1.110, 1.111 sources, 1.1019, 1.1020 upstream, 1.933, 1.934 linux-2.6-cdrom-door-status.patch, 1.3, NONE linux-2.6-iwl3945-remove-useless-exports.patch, 1.1, NONE
Kyle McMartin
kyle at fedoraproject.org
Wed May 6 16:39:42 UTC 2009
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11034
Modified Files:
.cvsignore config-generic kernel.spec linux-2.6-utrace.patch
sources upstream
Added Files:
patch-2.6.30-rc4-git3.bz2.sign
Removed Files:
linux-2.6-cdrom-door-status.patch
linux-2.6-iwl3945-remove-useless-exports.patch
Log Message:
* Wed May 06 2009 Kyle McMartin <kyle at redhat.com>
- Linux 2.6.30-rc4-git3
- linux-2.6-cdrom-door-status.patch: merged upstream.
- linux-2.6-iwl3945-remove-useless-exports.patch: merged upstream.
- linux-2.6-utrace.patch: rebase against changes to fs/proc/array.c
- USB_NET_CDC_EEM=m
--- NEW FILE patch-2.6.30-rc4-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBKAXx4yGugalF9Dw4RAqfWAJoDNLhYZCKzgvuWxmBYrc4wXLmRtQCdEbFB
7BQzBfklrSPdsImfPTO2BBQ=
=qPCI
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1060
retrieving revision 1.1061
diff -u -p -r1.1060 -r1.1061
--- .cvsignore 30 Apr 2009 21:03:29 -0000 1.1060
+++ .cvsignore 6 May 2009 16:39:11 -0000 1.1061
@@ -7,3 +7,4 @@ kernel-2.6.29
linux-2.6.29.tar.bz2
patch-2.6.29-git15.bz2
patch-2.6.30-rc4.bz2
+patch-2.6.30-rc4-git3.bz2
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -p -r1.282 -r1.283
--- config-generic 22 Apr 2009 15:40:04 -0000 1.282
+++ config-generic 6 May 2009 16:39:11 -0000 1.283
@@ -2820,6 +2820,7 @@ CONFIG_USB_NET_PLUSB=m
CONFIG_USB_NET_MCS7830=m
CONFIG_USB_NET_RNDIS_HOST=m
CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_NET_CDC_EEM=m
CONFIG_USB_NET_ZAURUS=m
#
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1539
retrieving revision 1.1540
diff -u -p -r1.1539 -r1.1540
--- kernel.spec 1 May 2009 18:29:15 -0000 1.1539
+++ kernel.spec 6 May 2009 16:39:11 -0000 1.1540
@@ -58,7 +58,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 4
# The git snapshot level
-%define gitrev 0
+%define gitrev 3
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -102,7 +102,7 @@ Summary: The Linux kernel
%define doc_build_fail true
%endif
-%define rawhide_skip_docs 0
+%define rawhide_skip_docs 1
%if 0%{?rawhide_skip_docs}
%define with_doc 0
%endif
@@ -641,10 +641,6 @@ Patch800: linux-2.6-crash-driver.patch
Patch1515: linux-2.6.29-lirc.patch
-# Fix the return code CD accesses when the CDROM drive door is closed
-# but the drive isn't yet ready.
-Patch1550: linux-2.6-cdrom-door-status.patch
-
Patch1700: agp-set_memory_ucwb.patch
# nouveau + drm fixes
Patch1811: drm-next.patch
@@ -676,8 +672,6 @@ Patch3000: linux-2.6-btrfs-experimental-
Patch9002: cpufreq-add-atom-to-p4-clockmod.patch
-Patch9100: linux-2.6-iwl3945-remove-useless-exports.patch
-
#snmp fixes
Patch10000: linux-2.6-missing-rfc2465-stats.patch
@@ -1209,10 +1203,6 @@ ApplyPatch linux-2.6-crash-driver.patch
# http://www.lirc.org/
ApplyPatch linux-2.6.29-lirc.patch
-# Fix the return code CD accesses when the CDROM drive door is closed
-# but the drive isn't yet ready.
-ApplyPatch linux-2.6-cdrom-door-status.patch
-
ApplyPatch linux-2.6-e1000-ich9.patch
ApplyPatch agp-set_memory_ucwb.patch
@@ -1241,8 +1231,6 @@ ApplyPatch linux-2.6-silence-acpi-blackl
#ApplyPatch cpufreq-add-atom-to-p4-clockmod.patch
-ApplyPatch linux-2.6-iwl3945-remove-useless-exports.patch
-
# END OF PATCH APPLICATIONS
%endif
@@ -1836,6 +1824,13 @@ fi
# ||----w |
# || ||
%changelog
+* Wed May 06 2009 Kyle McMartin <kyle at redhat.com>
+- Linux 2.6.30-rc4-git3
+- linux-2.6-cdrom-door-status.patch: merged upstream.
+- linux-2.6-iwl3945-remove-useless-exports.patch: merged upstream.
+- linux-2.6-utrace.patch: rebase against changes to fs/proc/array.c
+- USB_NET_CDC_EEM=m
+
* Fri May 01 2009 Eric Sandeen <sandeen at redhat.com>
- Fix ext4 corruption on partial write into prealloc block
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.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- linux-2.6-utrace.patch 8 Apr 2009 01:31:58 -0000 1.110
+++ linux-2.6-utrace.patch 6 May 2009 16:39:12 -0000 1.111
@@ -1,46 +1,5 @@
-utrace core
-
-This adds the utrace facility, a new modular interface in the kernel for
-implementing user thread tracing and debugging. This fits on top of the
-tracehook_* layer, so the new code is well-isolated.
-
-The new interface is in <linux/utrace.h> and the DocBook utrace book
-describes it. It allows for multiple separate tracing engines to work in
-parallel without interfering with each other. Higher-level tracing
-facilities can be implemented as loadable kernel modules using this layer.
-
-The new facility is made optional under CONFIG_UTRACE.
-When this is not enabled, no new code is added.
-It can only be enabled on machines that have all the
-prerequisites and select CONFIG_HAVE_ARCH_TRACEHOOK.
-
-In this initial version, utrace and ptrace do not play together at all.
-If ptrace is attached to a thread, the attach calls in the utrace kernel
-API return -EBUSY. If utrace is attached to a thread, the PTRACE_ATTACH
-or PTRACE_TRACEME request will return EBUSY to userland. The old ptrace
-code is otherwise unchanged and nothing using ptrace should be affected
-by this patch as long as utrace is not used at the same time. In the
-future we can clean up the ptrace implementation and rework it to use
-the utrace API.
-
-Signed-off-by: Roland McGrath <roland at redhat.com>
----
- Documentation/DocBook/Makefile | 2 +-
- Documentation/DocBook/utrace.tmpl | 571 +++++++++
- fs/proc/array.c | 3 +
- include/linux/init_task.h | 1 +
- include/linux/sched.h | 6 +
- include/linux/tracehook.h | 61 +-
- include/linux/utrace.h | 692 +++++++++++
- include/linux/utrace_struct.h | 58 +
- init/Kconfig | 9 +
- kernel/Makefile | 1 +
- kernel/ptrace.c | 18 +-
- kernel/utrace.c | 2351 +++++++++++++++++++++++++++++++++++++
- 12 files changed, 3770 insertions(+), 3 deletions(-)
-
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
-index a3a83d3..0a07ba9 100644
+index b1eb661..02851f6 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -9,7 +9,7 @@
@@ -54,7 +13,7 @@ index a3a83d3..0a07ba9 100644
mac80211.xml debugobjects.xml sh.xml regulator.xml \
diff --git a/Documentation/DocBook/utrace.tmpl b/Documentation/DocBook/utrace.tmpl
new file mode 100644
-index ...b802c55 100644
+index 0000000..b802c55
--- /dev/null
+++ b/Documentation/DocBook/utrace.tmpl
@@ -0,0 +1,571 @@
@@ -630,18 +589,18 @@ index ...b802c55 100644
+
+</book>
diff --git a/fs/proc/array.c b/fs/proc/array.c
-index 7e4877d..0c683ed 100644
+index 725a650..e299a63 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
-@@ -81,6 +81,7 @@
- #include <linux/seq_file.h>
+@@ -82,6 +82,7 @@
#include <linux/pid_namespace.h>
+ #include <linux/ptrace.h>
#include <linux/tracehook.h>
+#include <linux/utrace.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-@@ -187,6 +188,8 @@ static inline void task_state(struct seq
+@@ -188,6 +189,8 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns,
cred->uid, cred->euid, cred->suid, cred->fsuid,
cred->gid, cred->egid, cred->sgid, cred->fsgid);
@@ -651,10 +610,10 @@ index 7e4877d..0c683ed 100644
if (p->files)
fdt = files_fdtable(p->files);
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
-index dcfb933..5625de6 100644
+index d87247d..0d0b55d 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
-@@ -183,6 +183,7 @@ extern struct cred init_cred;
+@@ -170,6 +170,7 @@ extern struct cred init_cred;
[PIDTYPE_SID] = INIT_PID_LINK(PIDTYPE_SID), \
}, \
.dirties = INIT_PROP_LOCAL_SINGLE(dirties), \
@@ -663,7 +622,7 @@ index dcfb933..5625de6 100644
INIT_TRACE_IRQFLAGS \
INIT_LOCKDEP \
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 98e1fe5..e9c3350 100644
+index b4c38bc..30db106 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -59,6 +59,7 @@ struct sched_param {
@@ -674,7 +633,7 @@ index 98e1fe5..e9c3350 100644
#include <asm/system.h>
#include <asm/page.h>
-@@ -1290,6 +1291,11 @@ struct task_struct {
+@@ -1291,6 +1292,11 @@ struct task_struct {
#endif
seccomp_t seccomp;
@@ -687,7 +646,7 @@ index 98e1fe5..e9c3350 100644
u32 parent_exec_id;
u32 self_exec_id;
diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
-index 4ec4821..a7de30f 100644
+index 4ec4821..a7de30f 100644
--- a/include/linux/tracehook.h
+++ b/include/linux/tracehook.h
@@ -49,6 +49,7 @@
@@ -707,7 +666,7 @@ index 4ec4821..a7de30f 100644
return (task_ptrace(task) & PT_PTRACED) != 0;
}
-@@ -111,6 +114,9 @@ static inline void ptrace_report_syscall
+@@ -111,6 +114,9 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
static inline __must_check int tracehook_report_syscall_entry(
struct pt_regs *regs)
{
@@ -717,7 +676,7 @@ index 4ec4821..a7de30f 100644
ptrace_report_syscall(regs);
return 0;
}
-@@ -134,6 +140,8 @@ static inline __must_check int tracehook
+@@ -134,6 +140,8 @@ static inline __must_check int tracehook_report_syscall_entry(
*/
static inline void tracehook_report_syscall_exit(struct pt_regs *regs, int step)
{
@@ -726,7 +685,7 @@ index 4ec4821..a7de30f 100644
ptrace_report_syscall(regs);
}
-@@ -194,6 +202,8 @@ static inline void tracehook_report_exec
+@@ -194,6 +202,8 @@ static inline void tracehook_report_exec(struct linux_binfmt *fmt,
struct linux_binprm *bprm,
struct pt_regs *regs)
{
@@ -735,7 +694,7 @@ index 4ec4821..a7de30f 100644
if (!ptrace_event(PT_TRACE_EXEC, PTRACE_EVENT_EXEC, 0) &&
unlikely(task_ptrace(current) & PT_PTRACED))
send_sig(SIGTRAP, current, 0);
-@@ -211,6 +221,8 @@ static inline void tracehook_report_exec
+@@ -211,6 +221,8 @@ static inline void tracehook_report_exec(struct linux_binfmt *fmt,
*/
static inline void tracehook_report_exit(long *exit_code)
{
@@ -744,7 +703,7 @@ index 4ec4821..a7de30f 100644
ptrace_event(PT_TRACE_EXIT, PTRACE_EVENT_EXIT, *exit_code);
}
-@@ -254,6 +266,7 @@ static inline int tracehook_prepare_clon
+@@ -254,6 +266,7 @@ static inline int tracehook_prepare_clone(unsigned clone_flags)
static inline void tracehook_finish_clone(struct task_struct *child,
unsigned long clone_flags, int trace)
{
@@ -752,7 +711,7 @@ index 4ec4821..a7de30f 100644
ptrace_init_task(child, (clone_flags & CLONE_PTRACE) || trace);
}
-@@ -280,6 +293,8 @@ static inline void tracehook_report_clon
+@@ -280,6 +293,8 @@ static inline void tracehook_report_clone(int trace, struct pt_regs *regs,
unsigned long clone_flags,
pid_t pid, struct task_struct *child)
{
@@ -761,7 +720,7 @@ index 4ec4821..a7de30f 100644
if (unlikely(trace) || unlikely(clone_flags & CLONE_PTRACE)) {
/*
* The child starts up with an immediate SIGSTOP.
-@@ -311,6 +326,9 @@ static inline void tracehook_report_clon
+@@ -311,6 +326,9 @@ static inline void tracehook_report_clone_complete(int trace,
pid_t pid,
struct task_struct *child)
{
@@ -771,7 +730,7 @@ index 4ec4821..a7de30f 100644
if (unlikely(trace))
ptrace_event(0, trace, pid);
}
-@@ -345,6 +363,7 @@ static inline void tracehook_report_vfor
+@@ -345,6 +363,7 @@ static inline void tracehook_report_vfork_done(struct task_struct *child,
*/
static inline void tracehook_prepare_release_task(struct task_struct *task)
{
@@ -779,7 +738,7 @@ index 4ec4821..a7de30f 100644
}
/**
-@@ -359,6 +378,7 @@ static inline void tracehook_prepare_rel
+@@ -359,6 +378,7 @@ static inline void tracehook_prepare_release_task(struct task_struct *task)
static inline void tracehook_finish_release_task(struct task_struct *task)
{
ptrace_release_task(task);
@@ -787,7 +746,7 @@ index 4ec4821..a7de30f 100644
}
/**
-@@ -380,6 +400,8 @@ static inline void tracehook_signal_hand
+@@ -380,6 +400,8 @@ static inline void tracehook_signal_handler(int sig, siginfo_t *info,
const struct k_sigaction *ka,
struct pt_regs *regs, int stepping)
{
@@ -796,7 +755,7 @@ index 4ec4821..a7de30f 100644
if (stepping)
ptrace_notify(SIGTRAP);
}
-@@ -397,6 +419,8 @@ static inline void tracehook_signal_hand
+@@ -397,6 +419,8 @@ static inline void tracehook_signal_handler(int sig, siginfo_t *info,
static inline int tracehook_consider_ignored_signal(struct task_struct *task,
int sig)
{
@@ -805,7 +764,7 @@ index 4ec4821..a7de30f 100644
return (task_ptrace(task) & PT_PTRACED) != 0;
}
-@@ -416,6 +440,9 @@ static inline int tracehook_consider_ign
+@@ -416,6 +440,9 @@ static inline int tracehook_consider_ignored_signal(struct task_struct *task,
static inline int tracehook_consider_fatal_signal(struct task_struct *task,
int sig)
{
@@ -815,7 +774,7 @@ index 4ec4821..a7de30f 100644
return (task_ptrace(task) & PT_PTRACED) != 0;
}
-@@ -430,6 +457,8 @@ static inline int tracehook_consider_fat
+@@ -430,6 +457,8 @@ static inline int tracehook_consider_fatal_signal(struct task_struct *task,
*/
static inline int tracehook_force_sigpending(void)
{
@@ -824,7 +783,7 @@ index 4ec4821..a7de30f 100644
return 0;
}
-@@ -459,6 +488,8 @@ static inline int tracehook_get_signal(s
+@@ -459,6 +488,8 @@ static inline int tracehook_get_signal(struct task_struct *task,
siginfo_t *info,
struct k_sigaction *return_ka)
{
@@ -833,7 +792,7 @@ index 4ec4821..a7de30f 100644
return 0;
}
-@@ -486,6 +517,8 @@ static inline int tracehook_get_signal(s
+@@ -486,6 +517,8 @@ static inline int tracehook_get_signal(struct task_struct *task,
*/
static inline int tracehook_notify_jctl(int notify, int why)
{
@@ -842,7 +801,7 @@ index 4ec4821..a7de30f 100644
return notify ?: (current->ptrace & PT_PTRACED) ? why : 0;
}
-@@ -509,6 +542,8 @@ static inline int tracehook_notify_jctl(
+@@ -509,6 +542,8 @@ static inline int tracehook_notify_jctl(int notify, int why)
static inline int tracehook_notify_death(struct task_struct *task,
void **death_cookie, int group_dead)
{
@@ -851,7 +810,7 @@ index 4ec4821..a7de30f 100644
if (task_detached(task))
return task->ptrace ? SIGCHLD : DEATH_REAP;
-@@ -545,6 +580,20 @@ static inline void tracehook_report_deat
+@@ -545,6 +580,20 @@ static inline void tracehook_report_death(struct task_struct *task,
int signal, void *death_cookie,
int group_dead)
{
@@ -872,7 +831,7 @@ index 4ec4821..a7de30f 100644
}
#ifdef TIF_NOTIFY_RESUME
-@@ -574,10 +623,20 @@ static inline void set_notify_resume(str
+@@ -574,10 +623,20 @@ static inline void set_notify_resume(struct task_struct *task)
* asynchronously, this will be called again before we return to
* user mode.
*
@@ -896,7 +855,7 @@ index 4ec4821..a7de30f 100644
diff --git a/include/linux/utrace.h b/include/linux/utrace.h
new file mode 100644
-index ...f46cc0f 100644
+index 0000000..f46cc0f
--- /dev/null
+++ b/include/linux/utrace.h
@@ -0,0 +1,692 @@
@@ -1594,7 +1553,7 @@ index ...f46cc0f 100644
+#endif /* linux/utrace.h */
diff --git a/include/linux/utrace_struct.h b/include/linux/utrace_struct.h
new file mode 100644
-index ...aba7e09 100644
+index 0000000..aba7e09
--- /dev/null
+++ b/include/linux/utrace_struct.h
@@ -0,0 +1,58 @@
@@ -1657,10 +1616,10 @@ index ...aba7e09 100644
+
+#endif /* linux/utrace_struct.h */
diff --git a/init/Kconfig b/init/Kconfig
-index f2f9b53..0d104d9 100644
+index 7be4d38..a6987df 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1141,6 +1141,15 @@ config STOP_MACHINE
+@@ -1149,6 +1149,15 @@ config STOP_MACHINE
help
Need stop_machine() primitive.
@@ -1677,7 +1636,7 @@ index f2f9b53..0d104d9 100644
config PREEMPT_NOTIFIERS
diff --git a/kernel/Makefile b/kernel/Makefile
-index 4242366..a79634e 100644
+index 4242366..a79634e 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -68,6 +68,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
@@ -1689,7 +1648,7 @@ index 4242366..a79634e 100644
obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
obj-$(CONFIG_AUDIT_TREE) += audit_tree.o
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index aaad0ec..8ba9b73 100644
+index 0692ab5..1d33e9c 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -16,6 +16,7 @@
@@ -1700,8 +1659,8 @@ index aaad0ec..8ba9b73 100644
#include <linux/security.h>
#include <linux/signal.h>
#include <linux/audit.h>
-@@ -176,6 +177,14 @@ bool ptrace_may_access(struct task_struc
- return (!err ? true : false);
+@@ -174,6 +175,14 @@ bool ptrace_may_access(struct task_struct *task, unsigned int mode)
+ return !err;
}
+/*
@@ -1715,7 +1674,7 @@ index aaad0ec..8ba9b73 100644
int ptrace_attach(struct task_struct *task)
{
int retval;
-@@ -214,6 +223,11 @@ repeat:
+@@ -212,6 +221,11 @@ repeat:
goto repeat;
}
@@ -1727,7 +1686,7 @@ index aaad0ec..8ba9b73 100644
if (!task->mm)
goto bad;
/* the same process cannot be attached many times */
-@@ -590,7 +604,9 @@ int ptrace_traceme(void)
+@@ -588,7 +602,9 @@ int ptrace_traceme(void)
*/
repeat:
task_lock(current);
@@ -1740,7 +1699,7 @@ index aaad0ec..8ba9b73 100644
*/
diff --git a/kernel/utrace.c b/kernel/utrace.c
new file mode 100644
-index ...c2bb162 100644
+index 0000000..c2bb162
--- /dev/null
+++ b/kernel/utrace.c
@@ -0,0 +1,2351 @@
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1019
retrieving revision 1.1020
diff -u -p -r1.1019 -r1.1020
--- sources 30 Apr 2009 21:03:30 -0000 1.1019
+++ sources 6 May 2009 16:39:12 -0000 1.1020
@@ -1,2 +1,3 @@
64921b5ff5cdadbccfcd3820f03be7d8 linux-2.6.29.tar.bz2
1672a3064a2bfe049715a1103f03561c patch-2.6.30-rc4.bz2
+f04330e41b862632d60568dfd32ded6c patch-2.6.30-rc4-git3.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.933
retrieving revision 1.934
diff -u -p -r1.933 -r1.934
--- upstream 30 Apr 2009 21:03:30 -0000 1.933
+++ upstream 6 May 2009 16:39:12 -0000 1.934
@@ -1,2 +1,3 @@
linux-2.6.29.tar.bz2
patch-2.6.30-rc4.bz2
+patch-2.6.30-rc4-git3.bz2
--- linux-2.6-cdrom-door-status.patch DELETED ---
--- linux-2.6-iwl3945-remove-useless-exports.patch DELETED ---
More information about the scm-commits
mailing list