rpms/kernel/devel patch-2.6.30-rc4-git3.bz2.sign, NONE, 1.1.2.2 .cvsignore, 1.1014.2.11, 1.1014.2.12 config-generic, 1.238.6.18, 1.238.6.19 kernel.spec, 1.1294.2.23, 1.1294.2.24 linux-2.6-utrace.patch, 1.107.6.2, 1.107.6.3 sources, 1.976.2.12, 1.976.2.13 upstream, 1.888.2.11, 1.888.2.12 xen.pvops.patch, 1.1.2.18, 1.1.2.19 linux-2.6-cdrom-door-status.patch, 1.3, NONE linux-2.6-iwl3945-remove-useless-exports.patch, 1.1.2.2, NONE
Michael Young
myoung at fedoraproject.org
Wed May 6 21:49:41 UTC 2009
- Previous message: rpms/xmonad/devel xmonad-config-manpage.patch, NONE, 1.1 xmonad.desktop, 1.1, 1.2 xmonad.spec, 1.1, 1.2 manpage.patch, 1.1, NONE
- Next message: rpms/trousers/F-10 trousers.spec,1.11,1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: myoung
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30270
Modified Files:
Tag: private-myoung-dom0-branch
.cvsignore config-generic kernel.spec linux-2.6-utrace.patch
sources upstream xen.pvops.patch
Added Files:
Tag: private-myoung-dom0-branch
patch-2.6.30-rc4-git3.bz2.sign
Removed Files:
Tag: private-myoung-dom0-branch
linux-2.6-cdrom-door-status.patch
linux-2.6-iwl3945-remove-useless-exports.patch
Log Message:
update pvops patch and hopefully allow i686 to work again
--- 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.1014.2.11
retrieving revision 1.1014.2.12
diff -u -p -r1.1014.2.11 -r1.1014.2.12
--- .cvsignore 2 May 2009 18:00:24 -0000 1.1014.2.11
+++ .cvsignore 6 May 2009 21:48:44 -0000 1.1014.2.12
@@ -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.238.6.18
retrieving revision 1.238.6.19
diff -u -p -r1.238.6.18 -r1.238.6.19
--- config-generic 2 May 2009 18:00:24 -0000 1.238.6.18
+++ config-generic 6 May 2009 21:48:44 -0000 1.238.6.19
@@ -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.1294.2.23
retrieving revision 1.1294.2.24
diff -u -p -r1.1294.2.23 -r1.1294.2.24
--- kernel.spec 2 May 2009 21:34:23 -0000 1.1294.2.23
+++ kernel.spec 6 May 2009 21:48:44 -0000 1.1294.2.24
@@ -59,7 +59,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
@@ -642,10 +642,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
@@ -677,8 +673,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
@@ -1213,10 +1207,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
@@ -1245,8 +1235,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
-
ApplyPatch xen.pvops.pre.patch
ApplyPatch xen.pvops.patch
ApplyPatch xen.pvops.post.patch
@@ -1843,6 +1831,16 @@ fi
# ||----w |
# || ||
%changelog
+* Wed May 06 2009 Michael Young <m.a.young at durham.ac.uk>
+- update pvops patch from xen-tip/master - hopefully i686 will work again
+
+* 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
+
* Sat May 02 2009 Michael Young <m.a.young at durham.ac.uk>
- update pvops patch from xen-tip/master
- Try enabling CONFIG_XEN_GNTDEV and CONFIG_XEN_PCI_PASSTHROUGH
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.107.6.2
retrieving revision 1.107.6.3
diff -u -p -r1.107.6.2 -r1.107.6.3
--- linux-2.6-utrace.patch 24 Apr 2009 22:27:12 -0000 1.107.6.2
+++ linux-2.6-utrace.patch 6 May 2009 21:48:45 -0000 1.107.6.3
@@ -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.976.2.12
retrieving revision 1.976.2.13
diff -u -p -r1.976.2.12 -r1.976.2.13
--- sources 2 May 2009 18:00:25 -0000 1.976.2.12
+++ sources 6 May 2009 21:48:45 -0000 1.976.2.13
@@ -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.888.2.11
retrieving revision 1.888.2.12
diff -u -p -r1.888.2.11 -r1.888.2.12
--- upstream 2 May 2009 18:00:25 -0000 1.888.2.11
+++ upstream 6 May 2009 21:48:45 -0000 1.888.2.12
@@ -1,2 +1,3 @@
linux-2.6.29.tar.bz2
patch-2.6.30-rc4.bz2
+patch-2.6.30-rc4-git3.bz2
xen.pvops.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -p -N -r 1.1.2.18 -r 1.1.2.19 xen.pvops.patch
Index: xen.pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.patch,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -p -r1.1.2.18 -r1.1.2.19
--- xen.pvops.patch 2 May 2009 18:00:25 -0000 1.1.2.18
+++ xen.pvops.patch 6 May 2009 21:48:45 -0000 1.1.2.19
@@ -11168,7 +11168,7 @@ index 34c1304..5d55158 100644
0: always panic on uncorrected errors, log corrected errors
1: panic or SIGBUS on uncorrected errors, log corrected errors
diff --git a/MAINTAINERS b/MAINTAINERS
-index c547f4a..0e4bb2e 100644
+index 2b349ba..85826f5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3333,6 +3333,14 @@ F: drivers/serial/kgdboc.c
@@ -11204,7 +11204,7 @@ index c547f4a..0e4bb2e 100644
P: Christoph Hellwig
M: hch at infradead.org
diff --git a/Makefile b/Makefile
-index eb38c83..7cc8517 100644
+index b18afad..396e626 100644
--- a/Makefile
+++ b/Makefile
@@ -557,6 +557,10 @@ ifdef CONFIG_FUNCTION_TRACER
@@ -19771,7 +19771,7 @@ index 7e4a459..fd69c51 100644
switch (c->x86) {
case 0xf:
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index c4f6678..a86769e 100644
+index c1caefc..591012f 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -13,6 +13,7 @@
@@ -20063,10 +20063,10 @@ index 483eda9..789efe2 100644
};
diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c
-index 863f895..80ec191 100644
+index 6fb0b35..4bbc965 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_64.c
-@@ -449,6 +449,8 @@ void mce_log_therm_throt_event(__u64 status)
+@@ -450,6 +450,8 @@ void mce_log_therm_throt_event(__u64 status)
* Periodic polling timer for "silent" machine check errors. If the
* poller finds an MCE, poll 2x faster. When the poller finds no more
* errors, poll 2x slower (up to check_interval seconds).
@@ -20075,22 +20075,7 @@ index 863f895..80ec191 100644
*/
static int check_interval = 5 * 60; /* 5 minutes */
-@@ -633,11 +635,12 @@ static void mce_init_timer(void)
- {
- struct timer_list *t = &__get_cpu_var(mce_timer);
-
-+ /* Disable polling if check_interval is 0 */
-+ if (!check_interval)
-+ return;
- /* data race harmless because everyone sets to the same value */
- if (!next_interval)
- next_interval = check_interval * HZ;
-- if (!next_interval)
-- return;
- setup_timer(t, mcheck_timer, smp_processor_id());
- t->expires = round_jiffies(jiffies + next_interval);
- add_timer(t);
-@@ -838,25 +841,32 @@ static int __init mcheck_disable(char *str)
+@@ -839,25 +841,32 @@ static int __init mcheck_disable(char *str)
mce_dont_init = 1;
return 1;
}
@@ -28237,6 +28222,59 @@ index 7aa03a5..e68aea6 100644
if (pgd == NULL)
goto out;
+diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
+index 821e970..e69bdad 100644
+--- a/arch/x86/mm/tlb.c
++++ b/arch/x86/mm/tlb.c
+@@ -147,13 +147,25 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
+ * BUG();
+ */
+
+- if (f->flush_mm == percpu_read(cpu_tlbstate.active_mm)) {
+- if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK) {
++ if (f->flush_mm == NULL ||
++ f->flush_mm == percpu_read(cpu_tlbstate.active_mm)) {
++ int tlbstate = percpu_read(cpu_tlbstate.state);
++
++ /*
++ * flush_mm == NULL means flush everything, including
++ * global tlbs, which will only happen when flushing
++ * kernel mappings.
++ */
++ if (f->flush_mm == NULL)
++ __flush_tlb_all();
++ else if (tlbstate == TLBSTATE_OK) {
+ if (f->flush_va == TLB_FLUSH_ALL)
+ local_flush_tlb();
+ else
+ __flush_tlb_one(f->flush_va);
+- } else
++ }
++
++ if (tlbstate == TLBSTATE_LAZY)
+ leave_mm(cpu);
+ }
+ out:
+@@ -275,16 +287,11 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long va)
+ preempt_enable();
+ }
+
+-static void do_flush_tlb_all(void *info)
++void flush_tlb_all(void)
+ {
+- unsigned long cpu = smp_processor_id();
++ flush_tlb_others(cpu_online_mask, NULL, TLB_FLUSH_ALL);
+
+ __flush_tlb_all();
+ if (percpu_read(cpu_tlbstate.state) == TLBSTATE_LAZY)
+- leave_mm(cpu);
+-}
+-
+-void flush_tlb_all(void)
+-{
+- on_each_cpu(do_flush_tlb_all, NULL, 1);
++ leave_mm(smp_processor_id());
+ }
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index 202864a..c638685 100644
--- a/arch/x86/oprofile/nmi_int.c
@@ -28298,15 +28336,14 @@ index 10131fb..4da7230 100644
* doesn't hurt other P6 variant */
apic_write(APIC_LVTPC, apic_read(APIC_LVTPC) & ~APIC_LVT_MASKED);
diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
-index d49202e..9ade7be 100644
+index d49202e..64182c5 100644
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
-@@ -4,6 +4,8 @@ obj-$(CONFIG_PCI_BIOS) += pcbios.o
+@@ -4,6 +4,7 @@ obj-$(CONFIG_PCI_BIOS) += pcbios.o
obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_$(BITS).o direct.o mmconfig-shared.o
obj-$(CONFIG_PCI_DIRECT) += direct.o
obj-$(CONFIG_PCI_OLPC) += olpc.o
+obj-$(CONFIG_PCI_XEN) += xen.o
-+obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen/
obj-y += fixup.o
obj-$(CONFIG_ACPI) += acpi.o
@@ -28412,10 +28449,10 @@ index 25a1f8e..4e2f90a 100644
#endif
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
new file mode 100644
-index 0000000..859f335
+index 0000000..e134fb8
--- /dev/null
+++ b/arch/x86/pci/xen.c
-@@ -0,0 +1,81 @@
+@@ -0,0 +1,51 @@
+/*
+ * Xen PCI Frontend Stub - puts some "dummy" functions in to the Linux
+ * x86 PCI core to support the Xen PCI Frontend
@@ -28432,35 +28469,8 @@ index 0000000..859f335
+
+#include <asm/xen/hypervisor.h>
+
-+#include <xen/events.h>
-+
-+static int pcifront_raw_pci_read(unsigned int domain, unsigned int bus,
-+ unsigned int devfn, int reg, int len, u32 *val)
-+{
-+ return -ENODEV;
-+}
-+
-+static int pcifront_raw_pci_write(unsigned int domain, unsigned int bus,
-+ unsigned int devfn, int reg, int len, u32 val)
-+{
-+ return -ENODEV;
-+}
-+
-+struct pci_raw_ops pcifront_raw_bus_ops = {
-+ .read = pcifront_raw_pci_read,
-+ .write = pcifront_raw_pci_write,
-+};
-+
+static int xen_pcifront_enable_irq(struct pci_dev *dev)
+{
-+ int irq;
-+
-+ irq = xen_setup_pirq(dev->irq, "pci");
-+ if (irq < 0)
-+ return irq;
-+
-+ dev->irq = irq;
-+
+ return 0;
+}
+
@@ -28473,7 +28483,6 @@ index 0000000..859f335
[...2257 lines suppressed...]
-+
-+#ifdef __KERNEL__
-+
-+struct pcifront_device;
-+struct pci_bus;
-+
-+struct pcifront_sd {
-+ int domain;
-+ struct pcifront_device *pdev;
-+};
-+
-+static inline struct pcifront_device *
-+pcifront_get_pdev(struct pcifront_sd *sd)
-+{
-+ return sd->pdev;
-+}
-+
-+static inline void pcifront_init_sd(struct pcifront_sd *sd,
-+ unsigned int domain, unsigned int bus,
-+ struct pcifront_device *pdev)
-+{
-+ sd->domain = domain;
-+ sd->pdev = pdev;
-+}
-+
-+static inline void pcifront_setup_root_resources(struct pci_bus *bus,
-+ struct pcifront_sd *sd)
-+{
-+}
-+
-+extern struct rw_semaphore pci_bus_sem;
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* __XEN_ASM_PCIFRONT_H__ */
diff --git a/include/xen/privcmd.h b/include/xen/privcmd.h
new file mode 100644
index 0000000..c5d9067
@@ -51134,7 +49531,7 @@ index eef8cd2..3421e27 100644
val2 = (u32) (unsigned long) utime;
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
-index d82142b..37c6363 100644
+index 26e0875..07c3d7c 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -17,9 +17,11 @@
@@ -55401,7 +53798,7 @@ index e124bf5..97a2f81 100644
#ifdef CONFIG_DEBUG_RT_MUTEXES
# include "rtmutex-debug.h"
diff --git a/kernel/sched.c b/kernel/sched.c
-index b902e58..66bf4f9 100644
+index 26efa47..772483e 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -72,13 +72,15 @@
@@ -55968,7 +54365,7 @@ index 27dad29..68320f6 100644
+/* performance counters: */
+cond_syscall(sys_perf_counter_open);
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index e3d2c7d..11d87c0 100644
+index ea78fa1..9fbc05f 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -27,6 +27,7 @@
@@ -55987,7 +54384,7 @@ index e3d2c7d..11d87c0 100644
#include <asm/uaccess.h>
#include <asm/processor.h>
-@@ -1292,6 +1294,16 @@ static struct ctl_table vm_table[] = {
+@@ -1295,6 +1297,16 @@ static struct ctl_table vm_table[] = {
.extra2 = &one,
},
#endif
@@ -56004,7 +54401,7 @@ index e3d2c7d..11d87c0 100644
#ifdef CONFIG_UNEVICTABLE_LRU
{
.ctl_name = CTL_UNNUMBERED,
-@@ -1302,6 +1314,16 @@ static struct ctl_table vm_table[] = {
+@@ -1305,6 +1317,16 @@ static struct ctl_table vm_table[] = {
.proc_handler = &scan_unevictable_handler,
},
#endif
@@ -57825,7 +56222,7 @@ index 960cbf4..df20acd 100644
return 0;
}
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
-index 1ce5dc6..b6183bc 100644
+index a884c09..9b6e922 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -171,6 +171,13 @@ static struct trace_array global_trace;
@@ -58191,7 +56588,7 @@ index 1ce5dc6..b6183bc 100644
tracing_ctrl_read(struct file *filp, char __user *ubuf,
size_t cnt, loff_t *ppos)
{
-@@ -3596,7 +3679,7 @@ struct dentry *tracing_dentry_percpu(void)
+@@ -3597,7 +3680,7 @@ struct dentry *tracing_dentry_percpu(void)
static void tracing_init_debugfs_percpu(long cpu)
{
struct dentry *d_percpu = tracing_dentry_percpu();
@@ -58200,7 +56597,7 @@ index 1ce5dc6..b6183bc 100644
/* strlen(cpu) + MAX(log10(cpu)) + '\0' */
char cpu_dir[7];
-@@ -3611,21 +3694,15 @@ static void tracing_init_debugfs_percpu(long cpu)
+@@ -3612,21 +3695,15 @@ static void tracing_init_debugfs_percpu(long cpu)
}
/* per cpu trace_pipe */
@@ -58228,7 +56625,7 @@ index 1ce5dc6..b6183bc 100644
}
#ifdef CONFIG_FTRACE_SELFTEST
-@@ -3781,6 +3858,22 @@ static const struct file_operations trace_options_core_fops = {
+@@ -3782,6 +3859,22 @@ static const struct file_operations trace_options_core_fops = {
.write = trace_options_core_write,
};
@@ -58251,7 +56648,7 @@ index 1ce5dc6..b6183bc 100644
static struct dentry *trace_options_init_dentry(void)
{
struct dentry *d_tracer;
-@@ -3808,7 +3901,6 @@ create_trace_option_file(struct trace_option_dentry *topt,
+@@ -3809,7 +3902,6 @@ create_trace_option_file(struct trace_option_dentry *topt,
struct tracer_opt *opt)
{
struct dentry *t_options;
@@ -58259,7 +56656,7 @@ index 1ce5dc6..b6183bc 100644
t_options = trace_options_init_dentry();
if (!t_options)
-@@ -3817,11 +3909,9 @@ create_trace_option_file(struct trace_option_dentry *topt,
+@@ -3818,11 +3910,9 @@ create_trace_option_file(struct trace_option_dentry *topt,
topt->flags = flags;
topt->opt = opt;
@@ -58272,7 +56669,7 @@ index 1ce5dc6..b6183bc 100644
}
static struct trace_option_dentry *
-@@ -3876,123 +3966,84 @@ static struct dentry *
+@@ -3877,123 +3967,84 @@ static struct dentry *
create_trace_option_core_file(const char *option, long index)
{
struct dentry *t_options;
@@ -61733,7 +60130,7 @@ index 0000000..603c81b
+ This may also hide some real bugs.
+
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
-index d3da7ed..5d61019 100644
+index 69da09a..cdd205d 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -85,6 +85,7 @@ static u32 show_num_errors = 1;
@@ -61841,7 +60238,7 @@ index d3da7ed..5d61019 100644
/*
* DMA-API debugging init code
*
-@@ -490,6 +548,8 @@ void dma_debug_init(u32 num_entries)
+@@ -439,6 +497,8 @@ void dma_debug_init(u32 num_entries)
return;
}
@@ -62449,7 +60846,7 @@ index cbe9e05..28be15e 100644
+ up_write(&mm->mmap_sem);
}
diff --git a/mm/mmap.c b/mm/mmap.c
-index 3303d1b..8a49df4 100644
+index 6b7b1a9..2c1c2cb 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -28,6 +28,7 @@
@@ -62460,7 +60857,7 @@ index 3303d1b..8a49df4 100644
#include <asm/uaccess.h>
#include <asm/cacheflush.h>
-@@ -1223,6 +1224,9 @@ munmap_back:
+@@ -1219,6 +1220,9 @@ munmap_back:
if (correct_wcount)
atomic_inc(&inode->i_writecount);
out:
@@ -62470,7 +60867,7 @@ index 3303d1b..8a49df4 100644
mm->total_vm += len >> PAGE_SHIFT;
vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
if (vm_flags & VM_LOCKED) {
-@@ -1756,6 +1760,12 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -1752,6 +1756,12 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
do {
long nrpages = vma_pages(vma);
@@ -63234,7 +61631,7 @@ index c8fb456..499a67e 100644
-DEFINE_TRACE(kfree_skb);
EXPORT_TRACEPOINT_SYMBOL_GPL(kfree_skb);
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
-index ce6356c..273cdfd 100644
+index f091a5a..c0b24c7 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -39,6 +39,7 @@
--- linux-2.6-cdrom-door-status.patch DELETED ---
--- linux-2.6-iwl3945-remove-useless-exports.patch DELETED ---
- Previous message: rpms/xmonad/devel xmonad-config-manpage.patch, NONE, 1.1 xmonad.desktop, 1.1, 1.2 xmonad.spec, 1.1, 1.2 manpage.patch, 1.1, NONE
- Next message: rpms/trousers/F-10 trousers.spec,1.11,1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list