From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Make s390 compile and work with gcc4.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/s390/char/keyboard.c | 10 +++++-----
25-akpm/drivers/s390/cio/chsc.h | 2 --
25-akpm/include/asm-s390/system.h | 16 ++++++++++++----
25-akpm/include/asm-s390/uaccess.h | 9 ++++-----
4 files changed, 21 insertions(+), 16 deletions(-)
diff -puN drivers/s390/char/keyboard.c~s390-gcc4-compile-fixes drivers/s390/char/keyboard.c
--- 25/drivers/s390/char/keyboard.c~s390-gcc4-compile-fixes 2005-03-02 17:55:19.000000000 -0800
+++ 25-akpm/drivers/s390/char/keyboard.c 2005-03-02 17:55:19.000000000 -0800
@@ -32,11 +32,11 @@ static k_handler_fn K_HANDLERS;
static k_handler_fn *k_handler[16] = { K_HANDLERS };
/* maximum values each key_handler can handle */
-static const int max_vals[] = {
+static const int kbd_max_vals[] = {
255, ARRAY_SIZE(func_table) - 1, NR_FN_HANDLER - 1, 0,
NR_DEAD - 1, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
-static const int NR_TYPES = ARRAY_SIZE(max_vals);
+static const int KBD_NR_TYPES = ARRAY_SIZE(kbd_max_vals);
static unsigned char ret_diacr[NR_DEAD] = {
'`', '\'', '^', '~', '"', ','
@@ -360,7 +360,7 @@ do_kdsk_ioctl(struct kbd_data *kbd, stru
key_map = kbd->key_maps[tmp.kb_table];
if (key_map) {
val = U(key_map[tmp.kb_index]);
- if (KTYP(val) >= NR_TYPES)
+ if (KTYP(val) >= KBD_NR_TYPES)
val = K_HOLE;
} else
val = (tmp.kb_index ? K_HOLE : K_NOSUCHMAP);
@@ -378,9 +378,9 @@ do_kdsk_ioctl(struct kbd_data *kbd, stru
break;
}
- if (KTYP(tmp.kb_value) >= NR_TYPES)
+ if (KTYP(tmp.kb_value) >= KBD_NR_TYPES)
return -EINVAL;
- if (KVAL(tmp.kb_value) > max_vals[KTYP(tmp.kb_value)])
+ if (KVAL(tmp.kb_value) > kbd_max_vals[KTYP(tmp.kb_value)])
return -EINVAL;
if (!(key_map = kbd->key_maps[tmp.kb_table])) {
diff -puN drivers/s390/cio/chsc.h~s390-gcc4-compile-fixes drivers/s390/cio/chsc.h
--- 25/drivers/s390/cio/chsc.h~s390-gcc4-compile-fixes 2005-03-02 17:55:19.000000000 -0800
+++ 25-akpm/drivers/s390/cio/chsc.h 2005-03-02 17:55:19.000000000 -0800
@@ -18,8 +18,6 @@ struct channel_path {
struct device dev;
};
-extern struct channel_path *chps[];
-
extern void s390_process_css( void );
extern void chsc_validate_chpids(struct subchannel *);
extern void chpid_is_actually_online(int);
diff -puN include/asm-s390/system.h~s390-gcc4-compile-fixes include/asm-s390/system.h
--- 25/include/asm-s390/system.h~s390-gcc4-compile-fixes 2005-03-02 17:55:19.000000000 -0800
+++ 25-akpm/include/asm-s390/system.h 2005-03-02 17:55:19.000000000 -0800
@@ -335,19 +335,23 @@ __cmpxchg(volatile void *ptr, unsigned l
__asm__ __volatile__("lpswe 0(%0)" : : "a" (&psw), "m" (psw) : "cc" );
#define __ctl_load(array, low, high) ({ \
+ typedef struct { char _[sizeof(array)]; } addrtype; \
__asm__ __volatile__ ( \
" bras 1,0f\n" \
" lctlg 0,0,0(%0)\n" \
"0: ex %1,0(1)" \
- : : "a" (&array), "a" (((low)<<4)+(high)) : "1" ); \
+ : : "a" (&array), "a" (((low)<<4)+(high)), \
+ "m" (*(addrtype *)(array)) : "1" ); \
})
#define __ctl_store(array, low, high) ({ \
+ typedef struct { char _[sizeof(array)]; } addrtype; \
__asm__ __volatile__ ( \
" bras 1,0f\n" \
" stctg 0,0,0(%1)\n" \
"0: ex %2,0(1)" \
- : "=m" (array) : "a" (&array), "a" (((low)<<4)+(high)) : "1" ); \
+ : "=m" (*(addrtype *)(array)) \
+ : "a" (&array), "a" (((low)<<4)+(high)) : "1" ); \
})
#define __ctl_set_bit(cr, bit) ({ \
@@ -390,19 +394,23 @@ __cmpxchg(volatile void *ptr, unsigned l
__asm__ __volatile__("lpsw 0(%0)" : : "a" (&psw) : "cc" );
#define __ctl_load(array, low, high) ({ \
+ typedef struct { char _[sizeof(array)]; } addrtype; \
__asm__ __volatile__ ( \
" bras 1,0f\n" \
" lctl 0,0,0(%0)\n" \
"0: ex %1,0(1)" \
- : : "a" (&array), "a" (((low)<<4)+(high)) : "1" ); \
+ : : "a" (&array), "a" (((low)<<4)+(high)), \
+ "m" (*(addrtype *)(array)) : "1" ); \
})
#define __ctl_store(array, low, high) ({ \
+ typedef struct { char _[sizeof(array)]; } addrtype; \
__asm__ __volatile__ ( \
" bras 1,0f\n" \
" stctl 0,0,0(%1)\n" \
"0: ex %2,0(1)" \
- : "=m" (array) : "a" (&array), "a" (((low)<<4)+(high)): "1" ); \
+ : "=m" (*(addrtype *)(array)) \
+ : "a" (&array), "a" (((low)<<4)+(high)): "1" ); \
})
#define __ctl_set_bit(cr, bit) ({ \
diff -puN include/asm-s390/uaccess.h~s390-gcc4-compile-fixes include/asm-s390/uaccess.h
--- 25/include/asm-s390/uaccess.h~s390-gcc4-compile-fixes 2005-03-02 17:55:19.000000000 -0800
+++ 25-akpm/include/asm-s390/uaccess.h 2005-03-02 17:55:19.000000000 -0800
@@ -161,7 +161,7 @@ struct exception_table_entry
__put_user_asm(__x, ptr, __pu_err); \
break; \
default: \
- __pu_err = __put_user_bad(); \
+ __put_user_bad(); \
break; \
} \
__pu_err; \
@@ -182,7 +182,7 @@ struct exception_table_entry
})
-extern int __put_user_bad(void);
+extern int __put_user_bad(void) __attribute__((noreturn));
#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
#define __get_user_asm(x, ptr, err) \
@@ -225,8 +225,7 @@ extern int __put_user_bad(void);
__get_user_asm(__x, ptr, __gu_err); \
break; \
default: \
- __x = 0; \
- __gu_err = __get_user_bad(); \
+ __get_user_bad(); \
break; \
} \
(x) = __x; \
@@ -248,7 +247,7 @@ extern int __put_user_bad(void);
__get_user(x, ptr); \
})
-extern int __get_user_bad(void);
+extern int __get_user_bad(void) __attribute__((noreturn));
#define __put_user_unaligned __put_user
#define __get_user_unaligned __get_user
_