diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2011-01-14 16:21:47 -0600 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2011-01-15 08:40:07 -0600 |
| commit | 84cd8453f30787504305a1a1f8dd5af7a92aa485 (patch) | |
| tree | fcfeefd0eeaa78db2ef74062451a8319652ab530 /arch/parisc | |
| parent | fbea668498e93bb38ac9226c7af9120a25957375 (diff) | |
| download | op-kernel-dev-84cd8453f30787504305a1a1f8dd5af7a92aa485.zip op-kernel-dev-84cd8453f30787504305a1a1f8dd5af7a92aa485.tar.gz | |
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 obviously not to include linux/mm.h in our pgtable.h, which
unbreaks the build.
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'arch/parisc')
| -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 865f37a..6f1f65d 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 <linux/mm.h> /* for vm_area_struct */ #include <linux/bitops.h> +#include <linux/spinlock.h> #include <asm/processor.h> #include <asm/cache.h> +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 >= |
