diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-10-13 15:09:52 (GMT) |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-10-13 15:09:52 (GMT) |
| commit | 6267cf38eda00c2eade2f5959abb2b931850294d (patch) | |
| tree | 6b98066b25fcbd7344802220d172ae9edc53ae20 /include/linux | |
| parent | 7547ed9d3c6eb3e645f16951864973e342a8994a (diff) | |
| parent | 9d36d3eff2f85efad0a3b0c6031081654ae33928 (diff) | |
| download | linux-6267cf38eda00c2eade2f5959abb2b931850294d.tar.xz | |
Merge tag 'v4.9.56' into linux-linaro-lsk-v4.9
This is the 4.9.56 stable release
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cpuset.h | 6 | ||||
| -rw-r--r-- | include/linux/iio/adc/ad_sigma_delta.h | 3 | ||||
| -rw-r--r-- | include/linux/mmu_notifier.h | 5 | ||||
| -rw-r--r-- | include/linux/trace_events.h | 1 |
4 files changed, 15 insertions, 0 deletions
diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h index cd32a49..d807fa9 100644 --- a/include/linux/cpuset.h +++ b/include/linux/cpuset.h @@ -55,7 +55,9 @@ static inline void cpuset_dec(void) extern int cpuset_init(void); extern void cpuset_init_smp(void); +extern void cpuset_force_rebuild(void); extern void cpuset_update_active_cpus(bool cpu_online); +extern void cpuset_wait_for_hotplug(void); extern void cpuset_cpus_allowed(struct task_struct *p, struct cpumask *mask); extern void cpuset_cpus_allowed_fallback(struct task_struct *p); extern nodemask_t cpuset_mems_allowed(struct task_struct *p); @@ -168,11 +170,15 @@ static inline bool cpusets_enabled(void) { return false; } static inline int cpuset_init(void) { return 0; } static inline void cpuset_init_smp(void) {} +static inline void cpuset_force_rebuild(void) { } + static inline void cpuset_update_active_cpus(bool cpu_online) { partition_sched_domains(1, NULL, NULL); } +static inline void cpuset_wait_for_hotplug(void) { } + static inline void cpuset_cpus_allowed(struct task_struct *p, struct cpumask *mask) { diff --git a/include/linux/iio/adc/ad_sigma_delta.h b/include/linux/iio/adc/ad_sigma_delta.h index e7fdec4..6cc48ac 100644 --- a/include/linux/iio/adc/ad_sigma_delta.h +++ b/include/linux/iio/adc/ad_sigma_delta.h @@ -111,6 +111,9 @@ int ad_sd_write_reg(struct ad_sigma_delta *sigma_delta, unsigned int reg, int ad_sd_read_reg(struct ad_sigma_delta *sigma_delta, unsigned int reg, unsigned int size, unsigned int *val); +int ad_sd_reset(struct ad_sigma_delta *sigma_delta, + unsigned int reset_length); + int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev, const struct iio_chan_spec *chan, int *val); int ad_sd_calibrate_all(struct ad_sigma_delta *sigma_delta, diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h index a1a210d..25c0dc3 100644 --- a/include/linux/mmu_notifier.h +++ b/include/linux/mmu_notifier.h @@ -419,6 +419,11 @@ extern void mmu_notifier_synchronize(void); #else /* CONFIG_MMU_NOTIFIER */ +static inline int mm_has_notifiers(struct mm_struct *mm) +{ + return 0; +} + static inline void mmu_notifier_release(struct mm_struct *mm) { } diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h index be00761..ba57266 100644 --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h @@ -273,6 +273,7 @@ struct trace_event_call { int perf_refcount; struct hlist_head __percpu *perf_events; struct bpf_prog *prog; + struct perf_event *bpf_prog_owner; int (*perf_perm)(struct trace_event_call *, struct perf_event *); |