From 115374211961a503675730603e3d48d95d41736c Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Sun, 16 Jan 2011 23:06:14 +0100 Subject: [PATCH] parisc: fix compile breakage caused by inlining maybe_mkwrite On PARISC, we have an include of linux/mm.h inside our asm/pgtable.h, so this patch commit 14fd403f2146f740942d78af4e0ee59396ad8eab Author: Andrea Arcangeli Date: Thu Jan 13 15:46:37 2011 -0800 thp: export maybe_mkwrite causes us an unsatisfiable use of pte_mkwrite in linux/mm.h. The fix is to avoid including linux/mm.h in our pgtable.h, which unbreaks the build. Signed-off-by: Linus Torvalds --- arch/parisc/include/asm/pgtable.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h index 865f37a8a881..6f1f65d3c0ef 100644 --- a/arch/parisc/include/asm/pgtable.h +++ b/arch/parisc/include/asm/pgtable.h @@ -10,11 +10,13 @@ * we simulate an x86-style page table for the linux mm code */ -#include /* for vm_area_struct */ #include +#include #include #include +struct vm_area_struct; + /* * kern_addr_valid(ADDR) tests if ADDR is pointing to valid kernel * memory. For the return value to be meaningful, ADDR must be >=