diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-14 15:52:23 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-14 15:52:23 -0700 |
| commit | ee87cfbacf73810697ae65af579dc6f193c520f5 (patch) | |
| tree | be389832d60926d5f1c50cd13d08204dfd72ef03 /f4.patch | |
| parent | 0b9b586eb80f4a85b512496ce2d7f389c7271d1c (diff) | |
| download | patches-ee87cfbacf73810697ae65af579dc6f193c520f5.tar.gz | |
updated and new patches
Diffstat (limited to 'f4.patch')
| -rw-r--r-- | f4.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/f4.patch b/f4.patch index 7a9a2787ac5bba..b9c452085282b8 100644 --- a/f4.patch +++ b/f4.patch @@ -186,7 +186,7 @@ const struct attribute_group **drv_groups; --- a/kernel/events/core.c +++ b/kernel/events/core.c -@@ -6167,6 +6167,7 @@ type_show(struct device *dev, struct dev +@@ -6189,6 +6189,7 @@ type_show(struct device *dev, struct dev return snprintf(page, PAGE_SIZE-1, "%d\n", pmu->type); } @@ -194,7 +194,7 @@ static ssize_t perf_event_mux_interval_ms_show(struct device *dev, -@@ -6211,17 +6212,19 @@ perf_event_mux_interval_ms_store(struct +@@ -6233,17 +6234,19 @@ perf_event_mux_interval_ms_store(struct return count; } |