diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-08-28 12:58:03 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-08-28 12:58:03 -0400 |
| commit | ea4d65f14f6aaa53e379b93c5544245ef081b3e7 (patch) | |
| tree | a15485f4f1cf547a52b31fa8e16e14b9579b7200 /include/linux/ring_buffer.h | |
| parent | ce32d59ee2cd036f6e8a6ed17a06a0b0bec5c67c (diff) | |
| parent | 496f3347d834aec91c38b45d6249ed00f58ad233 (diff) | |
Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2
Diffstat (limited to 'include/linux/ring_buffer.h')
| -rw-r--r-- | include/linux/ring_buffer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h index 003d09ab308d..0940fda59872 100644 --- a/include/linux/ring_buffer.h +++ b/include/linux/ring_buffer.h | |||
| @@ -164,8 +164,8 @@ void ring_buffer_record_disable(struct ring_buffer *buffer); | |||
| 164 | void ring_buffer_record_enable(struct ring_buffer *buffer); | 164 | void ring_buffer_record_enable(struct ring_buffer *buffer); |
| 165 | void ring_buffer_record_off(struct ring_buffer *buffer); | 165 | void ring_buffer_record_off(struct ring_buffer *buffer); |
| 166 | void ring_buffer_record_on(struct ring_buffer *buffer); | 166 | void ring_buffer_record_on(struct ring_buffer *buffer); |
| 167 | int ring_buffer_record_is_on(struct ring_buffer *buffer); | 167 | bool ring_buffer_record_is_on(struct ring_buffer *buffer); |
| 168 | int ring_buffer_record_is_set_on(struct ring_buffer *buffer); | 168 | bool ring_buffer_record_is_set_on(struct ring_buffer *buffer); |
| 169 | void ring_buffer_record_disable_cpu(struct ring_buffer *buffer, int cpu); | 169 | void ring_buffer_record_disable_cpu(struct ring_buffer *buffer, int cpu); |
| 170 | void ring_buffer_record_enable_cpu(struct ring_buffer *buffer, int cpu); | 170 | void ring_buffer_record_enable_cpu(struct ring_buffer *buffer, int cpu); |
| 171 | 171 | ||
