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

Commit 0bfdf598 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc/64: Fix smp_wmb barrier definition use use lwsync consistently 



asm/barrier.h is not always included after asm/synch.h, which meant
it was missing __SUBARCH_HAS_LWSYNC, so in some files smp_wmb() would
be eieio when it should be lwsync. kernel/time/hrtimer.c is one case.

__SUBARCH_HAS_LWSYNC is only used in one place, so just fold it in
to where it's used. Previously with my small simulator config, 377
instances of eieio in the tree. After this patch there are 55.

Fixes: 46d075be ("powerpc: Optimise smp_wmb")
Cc: stable@vger.kernel.org # v2.6.29+
Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 9a2c1d31

arch/powerpc/include/asm/barrier.h

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ 
#define rmb()  __asm__ __volatile__ ("sync" : : : "memory")

#define wmb()  __asm__ __volatile__ ("sync" : : : "memory")



#ifdef __SUBARCH_HAS_LWSYNC

/* The sub-arch has lwsync */

#if defined(__powerpc64__) || defined(CONFIG_PPC_E500MC)

#    define SMPWMB      LWSYNC

#else

#    define SMPWMB      eieio

arch/powerpc/include/asm/synch.h

+0 −4
Original line number Diff line number Diff line
@@ -6,10 +6,6 @@ 
#include <linux/stringify.h>

#include <asm/feature-fixups.h>



#if defined(__powerpc64__) || defined(CONFIG_PPC_E500MC)

#define __SUBARCH_HAS_LWSYNC

#endif



#ifndef __ASSEMBLY__

extern unsigned int __start___lwsync_fixup, __stop___lwsync_fixup;

extern void do_lwsync_fixups(unsigned long value, void *fixup_start,