Re: [patch] s390: missing ifdef in bitops.h

[David Woodhouse <dwmw2@infradead.org>]

On Tue, 2006-06-13 at 14:09 +0200, Heiko Carstens wrote:
> Add missing #ifdef __KERNEL__ to asm-s390/bitops.h

But asm/bitops.h isn't suitable for userspace _anyway_, is it?
We should be able to drop all instances of __KERNEL__ from it.

Which means that asm-s390/posix_types.h probably ought never to be
trying to include asm/bitops.h in the !__KERNEL__ case... we never had
libc5 on S390 anyway, did we?

Martin, is it OK for me to add this to the hdrcleanup-2.6.git tree?

diff --git a/include/asm-s390/posix_types.h b/include/asm-s390/posix_types.h
index 61788de..18344dc 100644
--- a/include/asm-s390/posix_types.h
+++ b/include/asm-s390/posix_types.h
@@ -76,7 +76,7 @@ #endif                       /* !defined
 } __kernel_fsid_t;
 
 
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
+#ifdef __KERNEL__
 
 #ifndef _S390_BITOPS_H
 #include <asm/bitops.h>
@@ -94,6 +94,6 @@ #define __FD_ISSET(fd,fdsetp)  test_bit(
 #undef  __FD_ZERO
 #define __FD_ZERO(fdsetp) (memset ((fdsetp), 0, sizeof(*(fd_set *)(fdsetp))))
 
-#endif     /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)*/
+#endif     /* __KERNEL__ */
 
 #endif


 

-- 
dwmw2

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/