diff options
author | Li Zhong <zhong@linux.vnet.ibm.com> | 2014-01-28 07:22:42 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-01-29 00:58:48 -0500 |
commit | fd120dc2e205d2318a8b47d6d8098b789e3af67d (patch) | |
tree | 77f1d527668b2775559b5406c4bec2ab7c64ca35 | |
parent | 1c430c06d0ce871f36b2af504d45a07356e44800 (diff) |
powerpc/mm: Fix compile error of pgtable-ppc64.h
It seems that forward declaration couldn't work well with typedef, use
struct spinlock directly to avoiding following build errors:
In file included from include/linux/spinlock.h:81,
from include/linux/seqlock.h:35,
from include/linux/time.h:5,
from include/uapi/linux/timex.h:56,
from include/linux/timex.h:56,
from include/linux/sched.h:17,
from arch/powerpc/kernel/asm-offsets.c:17:
include/linux/spinlock_types.h:76: error: redefinition of typedef 'spinlock_t'
/root/linux-next/arch/powerpc/include/asm/pgtable-ppc64.h:563: note: previous declaration of 'spinlock_t' was here
Signed-off-by: Li Zhong <zhong@linux.vnet.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r-- | arch/powerpc/include/asm/pgtable-ppc64.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/pgtable-ppc64.h b/arch/powerpc/include/asm/pgtable-ppc64.h index d27960c89a71..bc141c950b1e 100644 --- a/arch/powerpc/include/asm/pgtable-ppc64.h +++ b/arch/powerpc/include/asm/pgtable-ppc64.h | |||
@@ -560,9 +560,9 @@ extern void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address, | |||
560 | pmd_t *pmdp); | 560 | pmd_t *pmdp); |
561 | 561 | ||
562 | #define pmd_move_must_withdraw pmd_move_must_withdraw | 562 | #define pmd_move_must_withdraw pmd_move_must_withdraw |
563 | typedef struct spinlock spinlock_t; | 563 | struct spinlock; |
564 | static inline int pmd_move_must_withdraw(spinlock_t *new_pmd_ptl, | 564 | static inline int pmd_move_must_withdraw(struct spinlock *new_pmd_ptl, |
565 | spinlock_t *old_pmd_ptl) | 565 | struct spinlock *old_pmd_ptl) |
566 | { | 566 | { |
567 | /* | 567 | /* |
568 | * Archs like ppc64 use pgtable to store per pmd | 568 | * Archs like ppc64 use pgtable to store per pmd |