[PATCH] mm: fix ptep_modify_* for no-MMU systems

[Jeremy Fitzhardinge]

Fixes build problem: 
the functions added to asm-generic/pgtable.h are only used by
mm/mprotect.c (a MMU-only file), but they were not added inside of the
CONFIG_MMU ifdef block.  since the functions rely on things inside of
CONFIG_MMU (the lines just above in pgtable.h), we get build failure
on all no-mmu setups:
  CC      init/main.o
In file included from include/asm/pgtable.h:94,
                 from include/linux/mm.h:39,
                 from include/asm/dma.h:39,
                 from include/linux/bootmem.h:8,
                 from init/main.c:27:
include/asm-generic/pgtable.h: In function '__ptep_modify_prot_start':
include/asm-generic/pgtable.h:210: error: implicit declaration of
function 'ptep_get_and_clear'
include/asm-generic/pgtable.h:210: error: incompatible types in return
make[1]: *** [init/main.o] Error 1
make: *** [init/main.o] Error 2

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Cc: Adrian Bunk <bunk@xxxxxxxxxx>
Cc: Mike Frysinger <vapier.adi@xxxxxxxxx>
---
include/asm-generic/pgtable.h |    2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

===================================================================
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@ -195,7 +195,6 @@
	}
	return 0;
}
-#endif /* CONFIG_MMU */

static inline pte_t __ptep_modify_prot_start(struct mm_struct *mm,
					     unsigned long addr,
@@ -253,6 +252,7 @@
	__ptep_modify_prot_commit(mm, addr, ptep, pte);
}
#endif /* __HAVE_ARCH_PTEP_MODIFY_PROT_TRANSACTION */
+#endif /* CONFIG_MMU */

/*
 * A facility to provide lazy MMU batching.  This allows PTE updates and



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/