From: Martin Schwidefsky Date: Wed, 4 Oct 2006 18:02:12 +0000 (+0200) Subject: [S390] incorrect placement of include. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=42e47eeb8fb3f9d2abe653cc7f185816068a057d;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git [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 --- diff --git a/include/asm-s390/spinlock.h b/include/asm-s390/spinlock.h index 6b78af16999b..3fd43826fd0b 100644 --- a/include/asm-s390/spinlock.h +++ b/include/asm-s390/spinlock.h @@ -11,10 +11,10 @@ #ifndef __ASM_SPINLOCK_H #define __ASM_SPINLOCK_H -#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2) - #include +#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)