[tip:x86/vdso] x86, vdso: Instead of dummy functions, include < linux/spinlock_up.h>

[tip-bot for H. Peter Anvin]

Commit-ID:  bd9ee7fd99f127ee1306289415141d45792c97f3
Gitweb:     http://git.kernel.org/tip/bd9ee7fd99f127ee1306289415141d45792c97f3
Author:     H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
AuthorDate: Sun, 16 Feb 2014 19:47:01 -0800
Committer:  H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
CommitDate: Sun, 16 Feb 2014 19:47:01 -0800

x86, vdso: Instead of dummy functions, include <linux/spinlock_up.h>

The list of dummy functions is insufficient.  However, instead of
having a full list of dummy functions we can include
<linux/spinlock_up.h> which contains the (trivial) implementations
that we use on uniprocessor.

There aren't supposed to be any spinlocks at all in the VDSO, of
course.

Cc: Stefani Seibold <stefani@xxxxxxxxxxx>
Link: http://lkml.kernel.org/r/1392587568-7325-10-git-send-email-stefani@xxxxxxxxxxx
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
---
 arch/x86/vdso/vdso32/vclock_gettime.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/arch/x86/vdso/vdso32/vclock_gettime.c b/arch/x86/vdso/vdso32/vclock_gettime.c
index 5de5057..2335f26 100644
--- a/arch/x86/vdso/vdso32/vclock_gettime.c
+++ b/arch/x86/vdso/vdso32/vclock_gettime.c
@@ -36,20 +36,12 @@
  * a lot of warnings with make C=1.
  * It is imposible not to include spinlock.h since most kernel headers does
  * include it.
+ *
+ * <linux/spinlock_up.h> includes the minimal functions which are used
+ * on UP; include it instead.
  */
 #define _ASM_X86_SPINLOCK_H
-
-/*
- * dummys for unneeded arck_spin functions
- */
-static inline void arch_spin_unlock_wait(void *p)
-{
-}
-
-static inline int arch_spin_is_locked(void *p)
-{
-	return 0;
-}
+#include <linux/spinlock_up.h>
 
 /*
  * The define of CONFIG_ILLEGAL_POINTER_VALUE is also to prevent the
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/