diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-08 13:50:00 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-08 13:50:35 -0700 |
| commit | 7e24cf43f7dcd6312473f01b59be60662232ffce (patch) | |
| tree | d2bf66d51d6d5673b44986456c38b81a95a539f7 /kernel/sysctl.c | |
| parent | a26d31cef06f43a76327c21235e75450869df2b8 (diff) | |
| parent | 33726bf2140a0e7c9de3ccd7cba6d69962f0b773 (diff) | |
| download | talos-op-linux-7e24cf43f7dcd6312473f01b59be60662232ffce.tar.gz talos-op-linux-7e24cf43f7dcd6312473f01b59be60662232ffce.zip | |
Merge 3.0-rc2 + Linus's latest into usb-linus
This is needed to get the following MAINTAINERS patch to apply properly.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 4fc92445a29c..f175d98bd355 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -938,6 +938,12 @@ static struct ctl_table kern_table[] = { }, #endif #ifdef CONFIG_PERF_EVENTS + /* + * User-space scripts rely on the existence of this file + * as a feature check for perf_events being enabled. + * + * So it's an ABI, do not remove! + */ { .procname = "perf_event_paranoid", .data = &sysctl_perf_event_paranoid, |
