s390 (7/8): warnings.

PATCH New Martin Schwidefsky 1 participant 1 message Dec 12, 2002

Share & tools

Martin Schwidefsky

author

2002-12-12 18:08 UTC #0 lore raw

PATCH 1/1 s390 (7/8): warnings.

Warning fixes: remove an unused variable and make bitops complain if the pointer isn't of type long. Make 31 bit BUG() emit 4 0-bytes instead of 2. This improves the readability of the listing.

diffstat:

 arch/s390x/mm/extable.c         |    1 
 include/asm-s390/bitops.h       |   70 ++++++++++++++++++++++++----------------
 include/asm-s390/page.h         |    2 -
 include/asm-s390/posix_types.h  |    6 +--
 include/asm-s390/rwsem.h        |    2 -
 include/asm-s390/setup.h        |   12 +++---
 include/asm-s390x/bitops.h      |   64 +++++++++++++++++++-----------------
 include/asm-s390x/posix_types.h |    6 +--
 include/asm-s390x/rwsem.h       |    2 -
 9 files changed, 92 insertions(+), 73 deletions(-)

arch/s390x/mm/extable.c +0 -1

diff -urN linux-2.5.51/arch/s390x/mm/extable.c linux-2.5.51-s390/arch/s390x/mm/extable.c
@@ -40,7 +40,6 @@
 unsigned long
 search_exception_table(unsigned long addr)
 {
-	struct list_head *i;
 	unsigned long ret = 0;
 	
 #ifndef CONFIG_MODULES

include/asm-s390/bitops.h +43 ~~-27~~

214 lines not on this page · raw message

include/asm-s390/page.h +1 -1

diff -urN linux-2.5.51/include/asm-s390/page.h linux-2.5.51-s390/include/asm-s390/page.h
@@ -64,7 +64,7 @@
 
 #define BUG() do { \
         printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
-        __asm__ __volatile__(".word 0x0000"); \
+        __asm__ __volatile__(".long 0"); \
 } while (0)                                       
 
 #define PAGE_BUG(page) do { \

include/asm-s390/posix_types.h +3 -3

diff -urN linux-2.5.51/include/asm-s390/posix_types.h linux-2.5.51-s390/include/asm-s390/posix_types.h
@@ -60,13 +60,13 @@
 #endif
 
 #undef  __FD_SET
-#define __FD_SET(fd,fdsetp)  set_bit(fd,fdsetp)
+#define __FD_SET(fd,fdsetp)  set_bit(fd,fdsetp->fds_bits)
 
 #undef  __FD_CLR
-#define __FD_CLR(fd,fdsetp)  clear_bit(fd,fdsetp)
+#define __FD_CLR(fd,fdsetp)  clear_bit(fd,fdsetp->fds_bits)
 
 #undef  __FD_ISSET
-#define __FD_ISSET(fd,fdsetp)  test_bit(fd,fdsetp)
+#define __FD_ISSET(fd,fdsetp)  test_bit(fd,fdsetp->fds_bits)
 
 #undef  __FD_ZERO
 #define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp)))

include/asm-s390/rwsem.h +1 -1

diff -urN linux-2.5.51/include/asm-s390/rwsem.h linux-2.5.51-s390/include/asm-s390/rwsem.h
@@ -228,7 +228,7 @@
                 : "=&d" (old), "=&d" (new)
 		: "a" (&sem->count), "m" (tmp)
 		: "cc", "memory" );
-	if (new > 1) // FIXME: is this correct ?!?
+	if (new > 1)
 		rwsem_downgrade_wake(sem);
 }

include/asm-s390/setup.h +6 -6

diff -urN linux-2.5.51/include/asm-s390/setup.h linux-2.5.51-s390/include/asm-s390/setup.h
@@ -25,13 +25,13 @@
  */
 extern unsigned long machine_flags;
 
-#define MACHINE_IS_VM    (machine_flags & 1)
-#define MACHINE_HAS_IEEE (machine_flags & 2)
-#define MACHINE_IS_P390  (machine_flags & 4)
-#define MACHINE_HAS_CSP  (machine_flags & 8)
-#define MACHINE_HAS_MVPG (machine_flags & 16)
+#define MACHINE_IS_VM		(machine_flags & 1)
+#define MACHINE_HAS_IEEE	(machine_flags & 2)
+#define MACHINE_IS_P390		(machine_flags & 4)
+#define MACHINE_HAS_CSP		(machine_flags & 8)
+#define MACHINE_HAS_MVPG	(machine_flags & 16)
 
-#define MACHINE_HAS_SCLP (!MACHINE_IS_P390)
+#define MACHINE_HAS_SCLP	(!MACHINE_IS_P390)
 
 /*
  * Console mode. Override with conmode=

include/asm-s390x/bitops.h +34 ~~-30~~

217 lines not on this page · raw message

include/asm-s390x/posix_types.h +3 -3

diff -urN linux-2.5.51/include/asm-s390x/posix_types.h linux-2.5.51-s390/include/asm-s390x/posix_types.h
@@ -58,13 +58,13 @@
 #endif
 
 #undef  __FD_SET
-#define __FD_SET(fd,fdsetp)  set_bit(fd,fdsetp)
+#define __FD_SET(fd,fdsetp)  set_bit(fd,fdsetp->fds_bits)
 
 #undef  __FD_CLR
-#define __FD_CLR(fd,fdsetp)  clear_bit(fd,fdsetp)
+#define __FD_CLR(fd,fdsetp)  clear_bit(fd,fdsetp->fds_bits)
 
 #undef  __FD_ISSET
-#define __FD_ISSET(fd,fdsetp)  test_bit(fd,fdsetp)
+#define __FD_ISSET(fd,fdsetp)  test_bit(fd,fdsetp->fds_bits)
 
 #undef  __FD_ZERO
 #define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp)))

include/asm-s390x/rwsem.h +1 -1

diff -urN linux-2.5.51/include/asm-s390x/rwsem.h linux-2.5.51-s390/include/asm-s390x/rwsem.h
@@ -228,7 +228,7 @@
                 : "=&d" (old), "=&d" (new)
 		: "a" (&sem->count), "m" (tmp)
 		: "cc", "memory" );
-	if (new > 1) // FIXME: is this correct ?!?
+	if (new > 1)
 		rwsem_downgrade_wake(sem);
 }