diff options
| author | Michael Young <m.a.young@durham.ac.uk> | 2011-03-24 13:55:08 +0000 |
|---|---|---|
| committer | Michael Young <m.a.young@durham.ac.uk> | 2011-03-24 13:55:08 +0000 |
| commit | 549b4aac8dcd6fd1cc9993226ce2ef6ae160aeb4 (patch) | |
| tree | 4663844fcc1f2e56693373c0779ef53d5174d74e | |
| parent | af3666d76ee2cd5d748b905f5111e1dadc80001a (diff) | |
| download | dom0-kernel-549b4aac8dcd6fd1cc9993226ce2ef6ae160aeb4.tar.gz dom0-kernel-549b4aac8dcd6fd1cc9993226ce2ef6ae160aeb4.tar.xz dom0-kernel-549b4aac8dcd6fd1cc9993226ce2ef6ae160aeb4.zip | |
revert a broken 2.6.32.34 patchf12/user/myoung/xendom0
| -rw-r--r-- | kernel.spec | 5 | ||||
| -rw-r--r-- | revert.perf.patch | 15 |
2 files changed, 20 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index d05a879..634c202 100644 --- a/kernel.spec +++ b/kernel.spec @@ -843,6 +843,8 @@ Patch14307: netlink-make-nlmsg_find_attr-take-a-const-ptr.patch Patch14305: tty-make-tiocgicount-a-handler.patch Patch14306: tty-icount-changeover-for-other-main-devices.patch +Patch19500: revert.perf.patch + Patch19997: xen.pvops.pre.patch Patch19998: xen.pvops.patch Patch19999: xen.pvops.post.patch @@ -1557,6 +1559,8 @@ ApplyPatch netlink-make-nlmsg_find_attr-take-a-const-ptr.patch ApplyPatch tty-make-tiocgicount-a-handler.patch ApplyPatch tty-icount-changeover-for-other-main-devices.patch +ApplyPatch revert.perf.patch + ApplyPatch xen.pvops.pre.patch ApplyPatch xen.pvops.patch ApplyPatch xen.pvops.post.patch @@ -2221,6 +2225,7 @@ fi posix-cpu-timers-workaround-to-suppress-problems-with-mt-exec.patch set CONFIG_IRQ_TIME_ACCOUNTING=n - update to latest xen/xen-next.2.6.32 +- revert a patch that breaks 2.6.32.34 * Sat Dec 04 2010 Michael Young <m.a.young@durham.ac.uk> - add patch "fix ethtool_get_drvinfo NULL pointer dereference" diff --git a/revert.perf.patch b/revert.perf.patch new file mode 100644 index 0000000..b9deac0 --- /dev/null +++ b/revert.perf.patch @@ -0,0 +1,15 @@ +# revert 6f197b73304b3bd3d5a43b931383a5331d6b2987 +# perf: Handle stopped state with tracepoints +diff --git a/kernel/perf_event.c b/kernel/perf_event.c +index 183d437..f9af60f 100644 +--- a/kernel/perf_event.c ++++ b/kernel/perf_event.c +@@ -4167,8 +4167,6 @@ static void tp_perf_event_destroy(struct perf_event *event) + + static const struct pmu *tp_perf_event_init(struct perf_event *event) + { +- if (event->hw.state & PERF_HES_STOPPED) +- return 0; + /* + * Raw tracepoint data is a severe data leak, only allow root to + * have these. |