Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd120dc2 authored by Li Zhong's avatar Li Zhong Committed by Benjamin Herrenschmidt
Browse files

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: default avatarLi Zhong <zhong@linux.vnet.ibm.com>
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 1c430c06

arch/powerpc/include/asm/pgtable-ppc64.h

+3 −3
Original line number Diff line number Diff line
@@ -560,9 +560,9 @@ extern void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address, 
			    pmd_t *pmdp);



#define pmd_move_must_withdraw pmd_move_must_withdraw

typedef struct spinlock spinlock_t;

static inline int pmd_move_must_withdraw(spinlock_t *new_pmd_ptl,

					 spinlock_t *old_pmd_ptl)

struct spinlock;

static inline int pmd_move_must_withdraw(struct spinlock *new_pmd_ptl,

					 struct spinlock *old_pmd_ptl)

{

	/*

	 * Archs like ppc64 use pgtable to store per pmd