diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-10 12:00:58 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-10 12:00:58 +0800 |
| commit | fd0d0fd17f47e0015e5be2a1e58434144a5f99e0 (patch) | |
| tree | f2cb780174ccdee6d1a95fd421ef7bcf1dd4be1c /include | |
| parent | d69f58e2b8396658b7577113f9887bd4d66d25f8 (diff) | |
| parent | 6a1bd90632464c129ad5f9ca7c54917a6dd7cb4b (diff) | |
Merge tag 'v4.4.48' into linux-linaro-lsk-v4.4
This is the 4.4.48 stable release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/memory_hotplug.h | 3 | ||||
| -rw-r--r-- | include/linux/percpu-refcount.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 2ea574ff9714..538488bd1d3d 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -85,7 +85,8 @@ extern int zone_grow_waitqueues(struct zone *zone, unsigned long nr_pages); extern int add_one_highpage(struct page *page, int pfn, int bad_ppro); /* VM interface that may be used by firmware interface */ extern int online_pages(unsigned long, unsigned long, int); -extern int test_pages_in_a_zone(unsigned long, unsigned long); +extern int test_pages_in_a_zone(unsigned long start_pfn, unsigned long end_pfn, + unsigned long *valid_start, unsigned long *valid_end); extern void __offline_isolated_pages(unsigned long, unsigned long); typedef void (*online_page_callback_t)(struct page *page); diff --git a/include/linux/percpu-refcount.h b/include/linux/percpu-refcount.h index 12c9b485beb7..abd7c01c84db 100644 --- a/include/linux/percpu-refcount.h +++ b/include/linux/percpu-refcount.h @@ -206,7 +206,7 @@ static inline void percpu_ref_get(struct percpu_ref *ref) static inline bool percpu_ref_tryget(struct percpu_ref *ref) { unsigned long __percpu *percpu_count; - int ret; + bool ret; rcu_read_lock_sched(); @@ -240,7 +240,7 @@ static inline bool percpu_ref_tryget(struct percpu_ref *ref) static inline bool percpu_ref_tryget_live(struct percpu_ref *ref) { unsigned long __percpu *percpu_count; - int ret = false; + bool ret = false; rcu_read_lock_sched(); |