Patchwork [1/2] sparc32: fix build, fix missing cpu_relax declaration

login
register
mail settings
Submitter Sam Ravnborg
Date May 21, 2011, 9:26 p.m.
Message ID <20110521212651.GA18545@merkur.ravnborg.org>
Download mbox | patch
Permalink /patch/96709/
State Accepted
Delegated to: David Miller
Headers show

Comments

Sam Ravnborg - May 21, 2011, 9:26 p.m.
From e8e6c6af3a369f51185012fc149629312d6b2a1c Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Sat, 21 May 2011 22:55:17 +0200
Subject: [PATCH 1/2] sparc32: fix build, fix missing cpu_relax declaration

Fix following sparc (32 bit) build error:

  CC      arch/sparc/kernel/asm-offsets.s
In file included from include/linux/seqlock.h:29:0,
                 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:2: error: implicit declaration of function 'cpu_relax'

Most likely caused by commit e66eed651fd1 ("list: remove
prefetching from regular list iterators") due to include
changes.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/sparc/include/asm/spinlock_32.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
David Miller - May 23, 2011, 3:43 a.m.
From: Sam Ravnborg <sam@ravnborg.org>
Date: Sat, 21 May 2011 23:26:51 +0200

>>From e8e6c6af3a369f51185012fc149629312d6b2a1c Mon Sep 17 00:00:00 2001
> From: Sam Ravnborg <sam@ravnborg.org>
> Date: Sat, 21 May 2011 22:55:17 +0200
> Subject: [PATCH 1/2] sparc32: fix build, fix missing cpu_relax declaration
> 
> Fix following sparc (32 bit) build error:
> 
>   CC      arch/sparc/kernel/asm-offsets.s
> In file included from include/linux/seqlock.h:29:0,
>                  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:2: error: implicit declaration of function 'cpu_relax'
> 
> Most likely caused by commit e66eed651fd1 ("list: remove
> prefetching from regular list iterators") due to include
> changes.
> 
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/sparc/include/asm/spinlock_32.h b/arch/sparc/include/asm/spinlock_32.h
index 7f9b9db..5f5b8bf 100644
--- a/arch/sparc/include/asm/spinlock_32.h
+++ b/arch/sparc/include/asm/spinlock_32.h
@@ -9,6 +9,7 @@ 
 #ifndef __ASSEMBLY__
 
 #include <asm/psr.h>
+#include <asm/processor.h> /* for cpu_relax */
 
 #define arch_spin_is_locked(lock) (*((volatile unsigned char *)(lock)) != 0)