linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Mutex compilation error
@ 2006-01-10 14:19 David Howells
  2006-01-10 20:48 ` [patch] remove unnecessary asm/mutex.h from kernel/mutex-debug.c Ingo Molnar
  0 siblings, 1 reply; 2+ messages in thread
From: David Howells @ 2006-01-10 14:19 UTC (permalink / raw)
  To: mingo; +Cc: linux-kernel


Hi Ingo,

I've found a compilation error in mutexes when using the null variety:

	In file included from kernel/mutex-debug.c:25:
	kernel/mutex-debug.h:23:1: warning: "__IP__" redefined
	In file included from include/asm/mutex.h:9,
			 from kernel/mutex-debug.c:23:
	include/asm-generic/mutex-null.h:15:1: warning: this is the location of the previous definition

It seems that mutex-null.h defined __IP__ before mutex-debug.h because in
mutex-debug.c:

	#include <asm/mutex.h>

	#include "mutex-debug.h"

is the ordering of the includes.

Whilst mutex-null.h defends against multiple inclusions of __IP__,
mutex-debug.h does not.

David

^ permalink raw reply	[flat|nested] 2+ messages in thread

* [patch] remove unnecessary asm/mutex.h from kernel/mutex-debug.c
  2006-01-10 14:19 Mutex compilation error David Howells
@ 2006-01-10 20:48 ` Ingo Molnar
  0 siblings, 0 replies; 2+ messages in thread
From: Ingo Molnar @ 2006-01-10 20:48 UTC (permalink / raw)
  To: David Howells; +Cc: linux-kernel, Linus Torvalds


On Tue, 10 Jan 2006, David Howells wrote:

> I've found a compilation error in mutexes when using the null variety:
> 
> 	In file included from kernel/mutex-debug.c:25:
> 	kernel/mutex-debug.h:23:1: warning: "__IP__" redefined
> 	In file included from include/asm/mutex.h:9,
> 			 from kernel/mutex-debug.c:23:
> 	include/asm-generic/mutex-null.h:15:1: warning: this is the location of the previous definition

ok, the patch below should solve this. This didnt trigger on any of the
existing arches until now, because neither used asm-generic/null.h as
their method. I build-tested the patch. Linus, please apply.

	Ingo
--

remove unnecessary (and incorrect) inclusion of asm/mutex.h, pointed out 
by David Howells.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

----

 kernel/mutex-debug.c |    2 --
 1 files changed, 2 deletions(-)

Index: linux/kernel/mutex-debug.c
===================================================================
--- linux.orig/kernel/mutex-debug.c
+++ linux/kernel/mutex-debug.c
@@ -20,8 +20,6 @@
 #include <linux/kallsyms.h>
 #include <linux/interrupt.h>
 
-#include <asm/mutex.h>
-
 #include "mutex-debug.h"
 
 /*

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2006-01-10 20:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-01-10 14:19 Mutex compilation error David Howells
2006-01-10 20:48 ` [patch] remove unnecessary asm/mutex.h from kernel/mutex-debug.c Ingo Molnar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).