diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-04 11:32:40 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-04 11:32:40 -0800 |
| commit | 52cdce8adb635746f53306ab2599ca64902bb1dc (patch) | |
| tree | 0b61680c30eb150796cf01186f15b4845cdee6dd /include/linux/vmstat.h | |
| parent | 3cd47869431d7402d0613cf0f7fbb392f2b97565 (diff) | |
| parent | 7dde4e74744772efdc85d7ed13495c7b6a0d881b (diff) | |
| download | cachepc-linux-52cdce8adb635746f53306ab2599ca64902bb1dc.tar.gz cachepc-linux-52cdce8adb635746f53306ab2599ca64902bb1dc.zip | |
Merge branch 'rotary-encoder' into next
Bring in updates to roraty encoder driver switching it away from legacy
platform data and over to generic device properties and adding support
for encoders using more than 2 GPIOs.
Diffstat (limited to 'include/linux/vmstat.h')
| -rw-r--r-- | include/linux/vmstat.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h index 5dbc8b0ee567..3e5d9075960f 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h @@ -176,11 +176,11 @@ extern void zone_statistics(struct zone *, struct zone *, gfp_t gfp); #define sub_zone_page_state(__z, __i, __d) mod_zone_page_state(__z, __i, -(__d)) #ifdef CONFIG_SMP -void __mod_zone_page_state(struct zone *, enum zone_stat_item item, int); +void __mod_zone_page_state(struct zone *, enum zone_stat_item item, long); void __inc_zone_page_state(struct page *, enum zone_stat_item); void __dec_zone_page_state(struct page *, enum zone_stat_item); -void mod_zone_page_state(struct zone *, enum zone_stat_item, int); +void mod_zone_page_state(struct zone *, enum zone_stat_item, long); void inc_zone_page_state(struct page *, enum zone_stat_item); void dec_zone_page_state(struct page *, enum zone_stat_item); @@ -205,7 +205,7 @@ void set_pgdat_percpu_threshold(pg_data_t *pgdat, * The functions directly modify the zone and global counters. */ static inline void __mod_zone_page_state(struct zone *zone, - enum zone_stat_item item, int delta) + enum zone_stat_item item, long delta) { zone_page_state_add(delta, zone, item); } |