diff options
author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2011-01-16 17:06:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-16 18:05:44 -0500 |
commit | 115374211961a503675730603e3d48d95d41736c (patch) | |
tree | c29e2394c212f1a9de5fdb7a34b866745f28f942 | |
parent | b3697c0255d9d73eaaa4deb4512e3f0ff97b3b71 (diff) |
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 <aarcange@redhat.com>
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 <torvalds@linux-foundation.org>
-rw-r--r-- | arch/parisc/include/asm/pgtable.h | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ | |||
10 | * we simulate an x86-style page table for the linux mm code | 10 | * we simulate an x86-style page table for the linux mm code |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/mm.h> /* for vm_area_struct */ | ||
14 | #include <linux/bitops.h> | 13 | #include <linux/bitops.h> |
14 | #include <linux/spinlock.h> | ||
15 | #include <asm/processor.h> | 15 | #include <asm/processor.h> |
16 | #include <asm/cache.h> | 16 | #include <asm/cache.h> |
17 | 17 | ||
18 | struct vm_area_struct; | ||
19 | |||
18 | /* | 20 | /* |
19 | * kern_addr_valid(ADDR) tests if ADDR is pointing to valid kernel | 21 | * kern_addr_valid(ADDR) tests if ADDR is pointing to valid kernel |
20 | * memory. For the return value to be meaningful, ADDR must be >= | 22 | * memory. For the return value to be meaningful, ADDR must be >= |