diff --git a/[refs] b/[refs] index 9905429b9bca..2700d67da85f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ad539b2bd89bf2e129123eb24d5bcc4484a35de +refs/heads/master: 83e5d8f7253cb7b14472385a6d57df1e9f848e8e diff --git a/trunk/include/linux/page-flags.h b/trunk/include/linux/page-flags.h index df313891db10..f2ee9b2332e3 100644 --- a/trunk/include/linux/page-flags.h +++ b/trunk/include/linux/page-flags.h @@ -136,7 +136,7 @@ struct page_state { extern void get_page_state(struct page_state *ret); extern void get_full_page_state(struct page_state *ret); extern unsigned long __read_page_state(unsigned offset); -extern void __mod_page_state(unsigned offset, unsigned long delta); +extern void __mod_page_state(unsigned long offset, unsigned long delta); #define read_page_state(member) \ __read_page_state(offsetof(struct page_state, member)) diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 70f710286ced..c976628f9d95 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -1158,7 +1158,7 @@ unsigned long __read_page_state(unsigned offset) return ret; } -void __mod_page_state(unsigned offset, unsigned long delta) +void __mod_page_state(unsigned long offset, unsigned long delta) { unsigned long flags; void* ptr;