Commit ecc81e0f authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files

ppc64: use lockc.c from powerpc/lib 



since it is effectively the same as locks.c from ppc64/lib.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent 43f35ec3

arch/powerpc/lib/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -7,10 +7,10 @@ obj-y := strcase.o string.o 
obj-$(CONFIG_PPC32)	+= div64.o copy_32.o checksum_32.o

obj-$(CONFIG_PPC64)	+= memcpy_64.o \

			   usercopy_64.o sstep.o mem_64.o

ifeq ($(CONFIG_PPC64),y)

obj-$(CONFIG_SMP)	+= locks.o

endif

endif



obj-$(CONFIG_PPC64)	+= checksum_64.o copypage_64.o copyuser_64.o

obj-$(CONFIG_PPC_ISERIES) += e2a.o

ifeq ($(CONFIG_PPC64),y)

obj-$(CONFIG_SMP)	+= locks.o

endif

arch/ppc64/lib/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -5,9 +5,4 @@ 
lib-y := string.o strcase.o

lib-y += memcpy.o usercopy.o



# Lock primitives are defined as no-ops in include/linux/spinlock.h

# for non-SMP configs. Don't build the real versions.



lib-$(CONFIG_SMP) += locks.o



lib-$(CONFIG_DEBUG_KERNEL) += sstep.o

arch/ppc64/lib/locks.c

deleted100644 → 0
+0 −95
Original line number Diff line number Diff line 
/*

 * Spin and read/write lock operations.

 *

 * Copyright (C) 2001-2004 Paul Mackerras <paulus@au.ibm.com>, IBM

 * Copyright (C) 2001 Anton Blanchard <anton@au.ibm.com>, IBM

 * Copyright (C) 2002 Dave Engebretsen <engebret@us.ibm.com>, IBM

 *   Rework to support virtual processors

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */



#include <linux/config.h>

#include <linux/kernel.h>

#include <linux/spinlock.h>

#include <linux/module.h>

#include <linux/stringify.h>

#include <asm/hvcall.h>

#include <asm/iSeries/HvCall.h>



/* waiting for a spinlock... */

#if defined(CONFIG_PPC_SPLPAR) || defined(CONFIG_PPC_ISERIES)



void __spin_yield(raw_spinlock_t *lock)

{

	unsigned int lock_value, holder_cpu, yield_count;

	struct paca_struct *holder_paca;



	lock_value = lock->slock;

	if (lock_value == 0)

		return;

	holder_cpu = lock_value & 0xffff;

	BUG_ON(holder_cpu >= NR_CPUS);

	holder_paca = &paca[holder_cpu];

	yield_count = holder_paca->lppaca.yield_count;

	if ((yield_count & 1) == 0)

		return;		/* virtual cpu is currently running */

	rmb();

	if (lock->slock != lock_value)

		return;		/* something has changed */

#ifdef CONFIG_PPC_ISERIES

	HvCall2(HvCallBaseYieldProcessor, HvCall_YieldToProc,

		((u64)holder_cpu << 32) | yield_count);

#else

	plpar_hcall_norets(H_CONFER, get_hard_smp_processor_id(holder_cpu),

			   yield_count);

#endif

}



/*

 * Waiting for a read lock or a write lock on a rwlock...

 * This turns out to be the same for read and write locks, since

 * we only know the holder if it is write-locked.

 */

void __rw_yield(raw_rwlock_t *rw)

{

	int lock_value;

	unsigned int holder_cpu, yield_count;

	struct paca_struct *holder_paca;



	lock_value = rw->lock;

	if (lock_value >= 0)

		return;		/* no write lock at present */

	holder_cpu = lock_value & 0xffff;

	BUG_ON(holder_cpu >= NR_CPUS);

	holder_paca = &paca[holder_cpu];

	yield_count = holder_paca->lppaca.yield_count;

	if ((yield_count & 1) == 0)

		return;		/* virtual cpu is currently running */

	rmb();

	if (rw->lock != lock_value)

		return;		/* something has changed */

#ifdef CONFIG_PPC_ISERIES

	HvCall2(HvCallBaseYieldProcessor, HvCall_YieldToProc,

		((u64)holder_cpu << 32) | yield_count);

#else

	plpar_hcall_norets(H_CONFER, get_hard_smp_processor_id(holder_cpu),

			   yield_count);

#endif

}

#endif



void __raw_spin_unlock_wait(raw_spinlock_t *lock)

{

	while (lock->slock) {

		HMT_low();

		if (SHARED_PROCESSOR)

			__spin_yield(lock);

	}

	HMT_medium();

}



EXPORT_SYMBOL(__raw_spin_unlock_wait);