2006-10-04 17:59:25

by Martin Schwidefsky

[permalink] [raw]
Subject: [S390] incorrect placement of include.

From: Martin Schwidefsky <[email protected]>

[S390] incorrect placement of include.

The include of linux/smp.h needs to be done before the #if that
checks for the compiler version. Seems like fallout from the
inline assembly cleanup patch vs. the directed yield patch.

Signed-off-by: Martin Schwidefsky <[email protected]>
---

include/asm-s390/spinlock.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff -urpN linux-2.6/include/asm-s390/spinlock.h linux-2.6-patched/include/asm-s390/spinlock.h
--- linux-2.6/include/asm-s390/spinlock.h 2006-10-04 19:53:37.000000000 +0200
+++ linux-2.6-patched/include/asm-s390/spinlock.h 2006-10-04 19:53:49.000000000 +0200
@@ -11,10 +11,10 @@
#ifndef __ASM_SPINLOCK_H
#define __ASM_SPINLOCK_H

-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
-
#include <linux/smp.h>

+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
+
static inline int
_raw_compare_and_swap(volatile unsigned int *lock,
unsigned int old, unsigned int new)