From: Andrew Morton In file included from include/linux/mm.h:39, from include/linux/pagemap.h:7, from arch/s390/appldata/appldata_base.c:25: include/asm/pgtable.h:660:1: warning: "SetPageUptodate" redefined In file included from arch/s390/appldata/appldata_base.c:23: include/linux/page-flags.h:129:1: warning: this is the location of the previous definition s390 wants to redefine SetPageUptodate, in a fragile manner. Make it robust. Cc: Christoph Lameter Cc: Heiko Carstens Cc: Martin Schwidefsky Signed-off-by: Andrew Morton --- include/asm-s390/pgtable.h | 7 ------- include/linux/page-flags.h | 9 ++++++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff -puN include/asm-s390/pgtable.h~zoned-vm-counters-create-vmstatc-h-from-page_allocc-h-s390-fix include/asm-s390/pgtable.h --- 25/include/asm-s390/pgtable.h~zoned-vm-counters-create-vmstatc-h-from-page_allocc-h-s390-fix Tue Jun 27 15:22:32 2006 +++ 25-akpm/include/asm-s390/pgtable.h Tue Jun 27 15:22:32 2006 @@ -657,13 +657,6 @@ static inline pte_t mk_pte_phys(unsigned __pte; \ }) -#define SetPageUptodate(_page) \ - do { \ - struct page *__page = (_page); \ - if (!test_and_set_bit(PG_uptodate, &__page->flags)) \ - page_test_and_clear_dirty(_page); \ - } while (0) - #ifdef __s390x__ #define pfn_pmd(pfn, pgprot) \ diff -puN include/linux/page-flags.h~zoned-vm-counters-create-vmstatc-h-from-page_allocc-h-s390-fix include/linux/page-flags.h --- 25/include/linux/page-flags.h~zoned-vm-counters-create-vmstatc-h-from-page_allocc-h-s390-fix Tue Jun 27 15:22:32 2006 +++ 25-akpm/include/linux/page-flags.h Tue Jun 27 15:22:32 2006 @@ -123,7 +123,14 @@ #define TestClearPageReferenced(page) test_and_clear_bit(PG_referenced, &(page)->flags) #define PageUptodate(page) test_bit(PG_uptodate, &(page)->flags) -#ifndef SetPageUptodate +#ifdef CONFIG_S390 +#define SetPageUptodate(_page) \ + do { \ + struct page *__page = (_page); \ + if (!test_and_set_bit(PG_uptodate, &__page->flags)) \ + page_test_and_clear_dirty(_page); \ + } while (0) +#else #define SetPageUptodate(page) set_bit(PG_uptodate, &(page)->flags) #endif #define ClearPageUptodate(page) clear_bit(PG_uptodate, &(page)->flags) _