[PATCH] 2.5.48 s390 (8/16): gcc 3.2 fixes.

Martin Schwidefsky (schwidefsky@de.ibm.com)
Mon, 18 Nov 2002 20:20:20 +0100

Messages sorted by: [ date ][ thread ][ subject ][ author ]
Next message: Martin Schwidefsky: "[PATCH] 2.5.48 s390 (7/16): uaccess bug."
Previous message: Martin Schwidefsky: "[PATCH] 2.5.48 s390 (3/16): mman."

Make the kernel compile with gcc 3.2.

diff -urN linux-2.5.48/include/asm-s390/smp.h linux-2.5.48-s390/include/asm-s390/smp.h
--- linux-2.5.48/include/asm-s390/smp.h Mon Nov 18 05:29:45 2002
+++ linux-2.5.48-s390/include/asm-s390/smp.h Mon Nov 18 20:11:38 2002
@@ -29,7 +29,7 @@
} sigp_info;

extern volatile unsigned long cpu_online_map;
-extern unsigned long cpu_possible_map;
+extern volatile unsigned long cpu_possible_map;

#define NO_PROC_ID 0xFF /* No processor magic marker */

diff -urN linux-2.5.48/include/asm-s390/unistd.h linux-2.5.48-s390/include/asm-s390/unistd.h
--- linux-2.5.48/include/asm-s390/unistd.h Mon Nov 18 20:11:15 2002
+++ linux-2.5.48-s390/include/asm-s390/unistd.h Mon Nov 18 20:11:38 2002
@@ -258,11 +258,11 @@
return (type) (res); \
} while (0)

-#define _svc_clobber "2", "cc", "memory"
+#define _svc_clobber "cc", "memory"

#define _syscall0(type,name) \
type name(void) { \
- long __res; \
+ register long __res asm("2"); \
__asm__ __volatile__ ( \
" svc %b1\n" \
" lr %0,2" \
@@ -275,13 +275,13 @@
#define _syscall1(type,name,type1,arg1) \
type name(type1 arg1) { \
register type1 __arg1 asm("2") = arg1; \
- long __res; \
+ register long __res asm("2"); \
__asm__ __volatile__ ( \
" svc %b1\n" \
" lr %0,2" \
: "=d" (__res) \
: "i" (__NR_##name), \
- "d" (__arg1) \
+ "0" (__arg1) \
: _svc_clobber ); \
__syscall_return(type,__res); \
}
@@ -290,13 +290,13 @@
type name(type1 arg1, type2 arg2) { \
register type1 __arg1 asm("2") = arg1; \
register type2 __arg2 asm("3") = arg2; \
- long __res; \
+ register long __res asm("2"); \
__asm__ __volatile__ ( \
" svc %b1\n" \
" lr %0,2" \
: "=d" (__res) \
: "i" (__NR_##name), \
- "d" (__arg1), \
+ "0" (__arg1), \
"d" (__arg2) \
: _svc_clobber ); \
__syscall_return(type,__res); \
@@ -307,13 +307,13 @@
register type1 __arg1 asm("2") = arg1; \
register type2 __arg2 asm("3") = arg2; \
register type3 __arg3 asm("4") = arg3; \
- long __res; \
+ register long __res asm("2"); \
__asm__ __volatile__ ( \
" svc %b1\n" \
" lr %0,2" \
: "=d" (__res) \
: "i" (__NR_##name), \
- "d" (__arg1), \
+ "0" (__arg1), \
"d" (__arg2), \
"d" (__arg3) \
: _svc_clobber ); \
@@ -327,13 +327,13 @@
register type2 __arg2 asm("3") = arg2; \
register type3 __arg3 asm("4") = arg3; \
register type4 __arg4 asm("5") = arg4; \
- long __res; \
+ register long __res asm("2"); \
__asm__ __volatile__ ( \
" svc %b1\n" \
" lr %0,2" \
: "=d" (__res) \
: "i" (__NR_##name), \
- "d" (__arg1), \
+ "0" (__arg1), \
"d" (__arg2), \
"d" (__arg3), \
"d" (__arg4) \
@@ -350,13 +350,13 @@
register type3 __arg3 asm("4") = arg3; \
register type4 __arg4 asm("5") = arg4; \
register type5 __arg5 asm("6") = arg5; \
- long __res; \
+ register long __res asm("2"); \
__asm__ __volatile__ ( \
" svc %b1\n" \
" lr %0,2" \
: "=d" (__res) \
: "i" (__NR_##name), \
- "d" (__arg1), \
+ "0" (__arg1), \
"d" (__arg2), \
"d" (__arg3), \
"d" (__arg4), \
diff -urN linux-2.5.48/include/asm-s390x/unistd.h linux-2.5.48-s390/include/asm-s390x/unistd.h
--- linux-2.5.48/include/asm-s390x/unistd.h Mon Nov 18 20:11:15 2002
+++ linux-2.5.48-s390/include/asm-s390x/unistd.h Mon Nov 18 20:11:38 2002
@@ -225,11 +225,11 @@
return (type) (res); \
} while (0)

-#define _svc_clobber "2", "cc", "memory"
+#define _svc_clobber "cc", "memory"

#define _syscall0(type,name) \
type name(void) { \
- long __res; \
+ register long __res asm("2"); \
__asm__ __volatile__ ( \
" svc %b1\n" \
" lgr %0,2" \
@@ -242,13 +242,13 @@
#define _syscall1(type,name,type1,arg1) \
type name(type1 arg1) { \
register type1 __arg1 asm("2") = arg1; \
- long __res; \
+ register long __res asm("2"); \
__asm__ __volatile__ ( \
" svc %b1\n" \
" lgr %0,2" \
: "=d" (__res) \
: "i" (__NR_##name), \
- "d" (__arg1) \
+ "0" (__arg1) \
: _svc_clobber ); \
__syscall_return(type,__res); \
}
@@ -257,13 +257,13 @@
type name(type1 arg1, type2 arg2) { \
register type1 __arg1 asm("2") = arg1; \
register type2 __arg2 asm("3") = arg2; \
- long __res; \
+ register long __res asm("2"); \
__asm__ __volatile__ ( \
" svc %b1\n" \
" lgr %0,2" \
: "=d" (__res) \
: "i" (__NR_##name), \
- "d" (__arg1), \
+ "0" (__arg1), \
"d" (__arg2) \
: _svc_clobber ); \
__syscall_return(type,__res); \
@@ -274,13 +274,13 @@
register type1 __arg1 asm("2") = arg1; \
register type2 __arg2 asm("3") = arg2; \
register type3 __arg3 asm("4") = arg3; \
- long __res; \
+ register long __res asm("2"); \
__asm__ __volatile__ ( \
" svc %b1\n" \
" lgr %0,2" \
: "=d" (__res) \
: "i" (__NR_##name), \
- "d" (__arg1), \
+ "0" (__arg1), \
"d" (__arg2), \
"d" (__arg3) \
: _svc_clobber ); \
@@ -294,13 +294,13 @@
register type2 __arg2 asm("3") = arg2; \
register type3 __arg3 asm("4") = arg3; \
register type4 __arg4 asm("5") = arg4; \
- long __res; \
+ register long __res asm("2"); \
__asm__ __volatile__ ( \
" svc %b1\n" \
" lgr %0,2" \
: "=d" (__res) \
: "i" (__NR_##name), \
- "d" (__arg1), \
+ "0" (__arg1), \
"d" (__arg2), \
"d" (__arg3), \
"d" (__arg4) \
@@ -317,13 +317,13 @@
register type3 __arg3 asm("4") = arg3; \
register type4 __arg4 asm("5") = arg4; \
register type5 __arg5 asm("6") = arg5; \
- long __res; \
+ register long __res asm("2"); \
__asm__ __volatile__ ( \
" svc %b1\n" \
" lgr %0,2" \
: "=d" (__res) \
: "i" (__NR_##name), \
- "d" (__arg1), \
+ "0" (__arg1), \
"d" (__arg2), \
"d" (__arg3), \
"d" (__arg4), \

-
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/

Next message: Martin Schwidefsky: "[PATCH] 2.5.48 s390 (7/16): uaccess bug."
Previous message: Martin Schwidefsky: "[PATCH] 2.5.48 s390 (3/16): mman."