summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2011-05-20 15:48:17 +1000
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-20 12:51:07 -0700
commitd974d905cbfc1039a73ba0c7eea3f4d4e13c0624 (patch)
tree7eed7674e9510a192cca1b6a25411e4893e16bc3
parent268bb0ce3e87872cb9290c322b0d35bce230d88f (diff)
downloadop-kernel-dev-d974d905cbfc1039a73ba0c7eea3f4d4e13c0624.zip
op-kernel-dev-d974d905cbfc1039a73ba0c7eea3f4d4e13c0624.tar.gz
spinlock_up.h: include asm/processor.h in for cpu_relax
Commit e66eed651fd1 ("list: remove prefetching from regular list iterators") removed the include of prefetch.h from list.h and this was a path to including asm/processor.h. We need to include it excplicitly now. Fixes this build error on sparc32 (at least): 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/sparc/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 Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/spinlock_up.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/spinlock_up.h b/include/linux/spinlock_up.h
index b14f6a9..a26e2fb 100644
--- a/include/linux/spinlock_up.h
+++ b/include/linux/spinlock_up.h
@@ -5,6 +5,8 @@
# error "please don't include this file directly"
#endif
+#include <asm/processor.h> /* for cpu_relax() */
+
/*
* include/linux/spinlock_up.h - UP-debug version of spinlocks.
*
OpenPOWER on IntegriCloud