Subject: [PATCH] lockdep: warn about lockdep disabling after kernel taint, fix

From: Ingo Molnar <[email-masked]>
Date: Tue, 14 Apr 2009 11:15:38 +0200

* Stephen Rothwell <[email-masked]> wrote:

> Hi all,
> 
> Today's linux-next build (sparc defconfig) failed like this:
> 
> In file included from kernel/panic.c:12:
> include/linux/debug_locks.h: In function '__debug_locks_off':
> include/linux/debug_locks.h:15: error: implicit declaration of function 'xchg'
> 
> Caused by commit 9eeba6138cefc0435695463ddadb0d95e0a6bcd2 ("lockdep: warn
> about lockdep disabling after kernel taint").  xchg is defined in
> asm/system.h on sparc. It looks like asm/atomic.h on 64bit sparc includes
> asm/system.h, but not on 32bit.
> 
> Dave, arch/sparc/include/asm/atomic_32.h should really include
> asm/system.h since xchg is used in there.
> 
> I have applied the following patch for today.

I dont think Sparc is at fault here - system.h is where we 
historically provided xchg() from. Then as atomic.h was introduced 
and extended, some architectures (x86 amongst them) gradually 
migrated their definition of xchg() into atomic.h and related helper 
headers. (while still making it available for system.h)

This opened up the path for someone eventually only including 
asm/atomic.h from generic code and breaking the architectures that 
only provide it via system.h. So i've queued up the fix below - this 
should address the problem on Sparc and s390.

So moving it to atomic.h does make sense - but that's no excuse for 
breaking the build. Sorry about this!

	Ingo

------------->
>>From f99a7c31f427f8f783c7b1379755f91b59acaf72 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <[email-masked]>
Date: Tue, 14 Apr 2009 11:03:12 +0200
Subject: [PATCH] lockdep: warn about lockdep disabling after kernel taint, fix

Impact: build fix

Stephen Rothwell reported that the Sparc build broke:

 In file included from kernel/panic.c:12:
 include/linux/debug_locks.h: In function '__debug_locks_off':
 include/linux/debug_locks.h:15: error: implicit declaration of function 'xchg'

due to:

 9eeba61: lockdep: warn about lockdep disabling after kernel taint

There is some inconsistency between architectures about where exactly
xchg() is defined. Most have it in system.h but also in atomic.h (which
is arguably the more logical point for it). Some, such as Sparc only
have it in asm/system.h and not available via asm/atomic.h.

Use the widest set of headers in debug_locks.h and also include asm/system.h.

Reported-by: Stephen Rothwell <[email-masked]>
Acked-by: Frederic Weisbecker <[email-masked]>
Signed-off-by: Ingo Molnar <[email-masked]>
---
 include/linux/debug_locks.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h
index 493dedb..29b3ce3 100644
--- a/include/linux/debug_locks.h
+++ b/include/linux/debug_locks.h
@@ -3,6 +3,7 @@
 
 #include <linux/kernel.h>
 #include <asm/atomic.h>
+#include <asm/system.h>
 
 struct task_struct;