summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/s390/kernel/compat_ioctl.c9
-rw-r--r--arch/s390/kernel/compat_linux.c3
-rw-r--r--arch/s390/kernel/compat_ptrace.h17
-rw-r--r--arch/s390/kernel/s390_ksyms.c2
-rw-r--r--arch/s390/kernel/smp.c7
-rw-r--r--arch/s390/kernel/traps.c2
-rw-r--r--arch/s390/mm/cmm.c3
-rw-r--r--arch/s390/mm/init.c4
-rw-r--r--include/asm-s390/compat.h1
-rw-r--r--include/asm-s390/sigp.h2
10 files changed, 27 insertions, 23 deletions
diff --git a/arch/s390/kernel/compat_ioctl.c b/arch/s390/kernel/compat_ioctl.c
index 390881f8b911..7c7ca191f7f4 100644
--- a/arch/s390/kernel/compat_ioctl.c
+++ b/arch/s390/kernel/compat_ioctl.c
@@ -49,7 +49,16 @@ COMPATIBLE_IOCTL(BIODASDRSRV)
COMPATIBLE_IOCTL(BIODASDRLSE)
COMPATIBLE_IOCTL(BIODASDSLCK)
COMPATIBLE_IOCTL(BIODASDINFO)
+COMPATIBLE_IOCTL(BIODASDINFO2)
COMPATIBLE_IOCTL(BIODASDFMT)
+COMPATIBLE_IOCTL(BIODASDPRRST)
+COMPATIBLE_IOCTL(BIODASDQUIESCE)
+COMPATIBLE_IOCTL(BIODASDRESUME)
+COMPATIBLE_IOCTL(BIODASDPRRD)
+COMPATIBLE_IOCTL(BIODASDPSRD)
+COMPATIBLE_IOCTL(BIODASDGATTR)
+COMPATIBLE_IOCTL(BIODASDSATTR)
+
#endif
#if defined(CONFIG_S390_TAPE) || defined(CONFIG_S390_TAPE_MODULE)
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index d69ded304b9b..963748950906 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -1161,8 +1161,7 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset, i
put_user(reclen, &dirent->d_reclen);
copy_to_user(dirent->d_name, name, namlen);
put_user(0, dirent->d_name + namlen);
- ((char *) dirent) += reclen;
- buf->current_dir = dirent;
+ buf->current_dir = ((void *)dirent) + reclen;
buf->count -= reclen;
return 0;
}
diff --git a/arch/s390/kernel/compat_ptrace.h b/arch/s390/kernel/compat_ptrace.h
index e6942a0eaad2..419aef913ee1 100644
--- a/arch/s390/kernel/compat_ptrace.h
+++ b/arch/s390/kernel/compat_ptrace.h
@@ -3,23 +3,20 @@
#include "compat_linux.h" /* needed for _psw_t32 */
-typedef struct
-{
+typedef struct {
__u32 cr[3];
-} per_cr_words32 __attribute__((packed));
+} per_cr_words32;
-typedef struct
-{
+typedef struct {
__u16 perc_atmid; /* 0x096 */
__u32 address; /* 0x098 */
__u8 access_id; /* 0x0a1 */
-} per_lowcore_words32 __attribute__((packed));
+} per_lowcore_words32;
-typedef struct
-{
+typedef struct {
union {
per_cr_words32 words;
- } control_regs __attribute__((packed));
+ } control_regs;
/*
* Use these flags instead of setting em_instruction_fetch
* directly they are used so that single stepping can be
@@ -37,7 +34,7 @@ typedef struct
union {
per_lowcore_words32 words;
} lowcore;
-} per_struct32 __attribute__((packed));
+} per_struct32;
struct user_regs_struct32
{
diff --git a/arch/s390/kernel/s390_ksyms.c b/arch/s390/kernel/s390_ksyms.c
index b51f748069a4..0153d8437ecc 100644
--- a/arch/s390/kernel/s390_ksyms.c
+++ b/arch/s390/kernel/s390_ksyms.c
@@ -29,6 +29,7 @@
EXPORT_SYMBOL_NOVERS(_oi_bitmap);
EXPORT_SYMBOL_NOVERS(_ni_bitmap);
EXPORT_SYMBOL_NOVERS(_zb_findmap);
+EXPORT_SYMBOL_NOVERS(_sb_findmap);
EXPORT_SYMBOL_NOVERS(__copy_from_user_asm);
EXPORT_SYMBOL_NOVERS(__copy_to_user_asm);
EXPORT_SYMBOL_NOVERS(__clear_user_asm);
@@ -92,5 +93,4 @@ EXPORT_SYMBOL(console_device);
EXPORT_SYMBOL_NOVERS(do_call_softirq);
EXPORT_SYMBOL(sys_wait4);
EXPORT_SYMBOL(cpcmd);
-EXPORT_SYMBOL(smp_call_function_on);
EXPORT_SYMBOL(sys_ioctl);
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index c528cb0acfd7..2ee07a475716 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -203,10 +203,11 @@ int smp_call_function_on(void (*func) (void *info), void *info,
put_cpu();
return 0;
}
+EXPORT_SYMBOL(smp_call_function_on);
static inline void do_send_stop(void)
{
- u32 dummy;
+ unsigned long dummy;
int i, rc;
/* stop all processors */
@@ -222,7 +223,7 @@ static inline void do_send_stop(void)
static inline void do_store_status(void)
{
unsigned long low_core_addr;
- u32 dummy;
+ unsigned long dummy;
int i, rc;
/* store status of all processors in their lowcores (real 0) */
@@ -619,7 +620,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
if (lowcore_ptr[i] == NULL || async_stack == 0ULL)
panic("smp_boot_cpus failed to allocate memory\n");
- memcpy(lowcore_ptr[i], &S390_lowcore, sizeof(struct _lowcore));
+ *(lowcore_ptr[i]) = S390_lowcore;
lowcore_ptr[i]->async_stack = async_stack + (ASYNC_SIZE);
}
set_prefix((u32)(unsigned long) lowcore_ptr[smp_processor_id()]);
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index 26291f8d748a..b2bc205d40cb 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -616,8 +616,6 @@ void __init trap_init(void)
pgm_check_table[9] = &divide_exception;
pgm_check_table[0x10] = &do_segment_exception;
pgm_check_table[0x11] = &do_page_exception;
- pgm_check_table[0x10] = &do_segment_exception;
- pgm_check_table[0x11] = &do_page_exception;
pgm_check_table[0x12] = &translation_exception;
pgm_check_table[0x13] = &special_op_exception;
#ifndef CONFIG_ARCH_S390X
diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c
index f3221ed4e4c3..095a5648c1cf 100644
--- a/arch/s390/mm/cmm.c
+++ b/arch/s390/mm/cmm.c
@@ -87,8 +87,7 @@ cmm_alloc_pages(long pages, long *counter, struct cmm_page_array **list)
pa->index = 0;
*list = pa;
}
- if (page < 0x80000000UL)
- diag10(page);
+ diag10(page);
pa->pages[pa->index++] = page;
(*counter)++;
pages--;
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 7248a1657fe5..c2a74cea7702 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -42,9 +42,9 @@ char empty_zero_page[PAGE_SIZE] __attribute__((__aligned__(PAGE_SIZE)));
void diag10(unsigned long addr)
{
-#ifdef __s390x__
- if (addr >= 0x80000000)
+ if (addr >= 0x7ff00000)
return;
+#ifdef __s390x__
asm volatile ("sam31\n\t"
"diag %0,%0,0x10\n\t"
"sam64" : : "a" (addr) );
diff --git a/include/asm-s390/compat.h b/include/asm-s390/compat.h
index 1b564c562462..40839180883a 100644
--- a/include/asm-s390/compat.h
+++ b/include/asm-s390/compat.h
@@ -25,6 +25,7 @@ typedef u16 compat_ipc_pid_t;
typedef s32 compat_daddr_t;
typedef u32 compat_caddr_t;
typedef __kernel_fsid_t compat_fsid_t;
+typedef s32 compat_timer_t;
typedef s32 compat_int_t;
typedef s32 compat_long_t;
diff --git a/include/asm-s390/sigp.h b/include/asm-s390/sigp.h
index fa78e05a19c5..d5583c78dc9b 100644
--- a/include/asm-s390/sigp.h
+++ b/include/asm-s390/sigp.h
@@ -121,7 +121,7 @@ signal_processor_p(unsigned long parameter,__u16 cpu_addr,
* Signal processor with parameter and return status
*/
extern __inline__ sigp_ccode
-signal_processor_ps(__u32 *statusptr, unsigned long parameter,
+signal_processor_ps(unsigned long *statusptr, unsigned long parameter,
__u16 cpu_addr, sigp_order_code order_code)
{
sigp_ccode ccode;
generated by cgit v1.2.3 (git 2.46.0) at 2026-02-08 02:16:19 +0000