build error in current -git tree

build error in current -git tree

[Greg KH]

In trying to build your kernel tree right now, I get the following
error:

  CC      arch/i386/kernel/asm-offsets.s
In file included from include/linux/signal.h:6,
                 from include/linux/sched.h:28,
                 from arch/i386/kernel/asm-offsets.c:7:
include/asm/signal.h:190: error: redefinition of '__const_sigaddset'
include/asm/signal.h:173: error: previous definition of '__const_sigaddset' was here
make[1]: *** [arch/i386/kernel/asm-offsets.s] Error 1
make: *** [prepare0] Error 2


thanks,

greg k-h

Re: build error in current -git tree

[Linus Torvalds]

On Thu, 17 Nov 2005, Greg KH wrote:
>
> In trying to build your kernel tree right now, I get the following
> error:

Heh. That's what I get for being on ppc64 now.

This should fix it (and I'll try it out on my laptop before I commit it).

		Linus

---
diff --git a/include/asm-i386/signal.h b/include/asm-i386/signal.h
index 6ba29f1..76524b4 100644
--- a/include/asm-i386/signal.h
+++ b/include/asm-i386/signal.h
@@ -186,7 +186,7 @@ static __inline__ void __gen_sigdelset(s
 	__asm__("btrl %1,%0" : "+m"(*set) : "Ir"(_sig - 1) : "cc");
 }
 
-static __inline__ void __const_sigaddset(sigset_t *set, int _sig)
+static __inline__ void __const_sigdelset(sigset_t *set, int _sig)
 {
 	unsigned long sig = _sig - 1;
 	set->sig[sig / _NSIG_BPW] &= ~(1 << (sig % _NSIG_BPW));

Re: build error in current -git tree

[Greg KH]

On Thu, Nov 17, 2005 at 09:42:12AM -0800, Linus Torvalds wrote:
> 
> 
> On Thu, 17 Nov 2005, Greg KH wrote:
> >
> > In trying to build your kernel tree right now, I get the following
> > error:
> 
> Heh. That's what I get for being on ppc64 now.
> 
> This should fix it (and I'll try it out on my laptop before I commit it).

Yup, your commited change fixed it for me, thanks.

greg k-h