Commit 603605ab authored May 23, 2011 by Marc Zyngier Committed by Russell King May 23, 2011

ARM: 6939/1: fix missing 'cpu_relax()' declaration



ARM build fails with the following symptom:

  CC      arch/arm/kernel/asm-offsets.s
In file included from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:57,
                 from arch/arm/kernel/asm-offsets.c:13:
include/linux/spinlock.h: In function 'spin_unlock_wait':
include/linux/spinlock.h:360: error: implicit declaration of function 'cpu_relax'
make[1]: *** [arch/arm/kernel/asm-offsets.s] Error 1

Fix it by including <asm/processor.h>.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 57ce9bb3

arch/arm/include/asm/spinlock.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,8 @@
		#error SMP not supported on pre-ARMv6 CPUs
		#endif

		#include <asm/processor.h>

		/*
		* sev and wfe are ARMv6K extensions. Uniprocessor ARMv6 may not have the K
		* extensions, so when running on UP, we have to patch these instructions away.