perf: Hide ABI change in 3.2.30
svn path=/dists/sid/linux/; revision=19398
This commit is contained in:
parent
7dee4d8321
commit
a13dc8edcd
|
@ -1,7 +1,6 @@
|
|||
[abi]
|
||||
abiname: 4
|
||||
ignore-changes:
|
||||
perf_*
|
||||
xprt_*
|
||||
|
||||
[base]
|
||||
|
|
|
@ -0,0 +1,23 @@
|
|||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Subject: perf: Hide ABI change in 3.2.30
|
||||
|
||||
<linux/perf_events.h> is included by many source files but we don't
|
||||
want to bump the ABI number again right now.
|
||||
|
||||
The new member (atomic_long_t refcount) has the same size as the old
|
||||
(struct file *filp) and neither should be needed by OOT modules (if
|
||||
they make use of perf_events at all). So pretend this didn't happen.
|
||||
--- a/include/linux/perf_event.h
|
||||
+++ b/include/linux/perf_event.h
|
||||
@@ -794,7 +794,11 @@ struct perf_event {
|
||||
struct hw_perf_event hw;
|
||||
|
||||
struct perf_event_context *ctx;
|
||||
+#ifdef __GENKSYMS__
|
||||
+ struct file *filp;
|
||||
+#else
|
||||
atomic_long_t refcount;
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* These accumulate total time (in nanoseconds) that children
|
|
@ -396,3 +396,4 @@ bugfix/alpha/alpha-use-large-data-model.diff
|
|||
bugfix/x86/drm-i915-i8xx-interrupt-handler.patch
|
||||
features/arm/ahci-Add-JMicron-362-device-IDs.patch
|
||||
bugfix/all/speakup-lower-default-software-speech-rate.patch
|
||||
debian/perf-hide-abi-change-in-3.2.30.patch
|
||||
|
|
Loading…
Reference in New Issue