On Mon, Nov 08, 2010 at 03:27:26PM -0800, Greg Thelen wrote: > Johannes Weiner <hannes@xxxxxxxxxxx> writes: > > --- a/include/linux/memcontrol.h > > +++ b/include/linux/memcontrol.h > > @@ -157,7 +157,7 @@ static inline void mem_cgroup_dec_page_s > > bool mem_cgroup_has_dirty_limit(void); > > bool mem_cgroup_dirty_info(unsigned long sys_available_mem, > > struct dirty_info *info); > > -s64 mem_cgroup_page_stat(enum mem_cgroup_nr_pages_item item); > > +long mem_cgroup_page_stat(enum mem_cgroup_nr_pages_item item); > > Ooops. I missed something in my review. > > mem_cgroup_page_stat() appears twice in memcontrol.h The return value > should match regardless of if CONFIG_CGROUP_MEM_RES_CTLR is set. > > I suggest integrating the following into you patch ([patch 4/4] memcg: > use native word page statistics counters): Right you are! Thanks. Hannes > --- > include/linux/memcontrol.h | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index 4e046d6..7a3d915 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -351,7 +351,7 @@ static inline bool mem_cgroup_dirty_info(unsigned long sys_available_mem, > return false; > } > > -static inline s64 mem_cgroup_page_stat(enum mem_cgroup_nr_pages_item item) > +static inline long mem_cgroup_page_stat(enum mem_cgroup_nr_pages_item item) > { > return -ENOSYS; > } -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxxx For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom policy in Canada: sign http://dissolvethecrtc.ca/ Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>