From 9a1ac79caa580ee26f71907b6fbb7d248a9c3cd0 Mon Sep 17 00:00:00 2001 From: Martin Schwidefsky Date: Mon, 23 Aug 2004 21:42:10 -0700 Subject: [PATCH] [PATCH] s390: core changes From: Jan Glauber From: Martin Schwidefsky s390 core changes: - Use copy_siginfo_from_user32 instead of copy_from_user to get the siginfo structure in sys32_rt_sigqueueinfo. - Remove prototype for non-existant stop_timers function. - Regenerate default configuration. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/s390/defconfig | 4 ++-- arch/s390/kernel/compat_linux.c | 3 +-- arch/s390/kernel/vtime.c | 2 +- include/asm-s390/timer.h | 2 -- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/arch/s390/defconfig b/arch/s390/defconfig index d4cd42c3e7920..a45a0283547e3 100644 --- a/arch/s390/defconfig +++ b/arch/s390/defconfig @@ -419,7 +419,6 @@ CONFIG_RAMFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set @@ -511,11 +510,12 @@ CONFIG_CRYPTO=y # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_TWOFISH is not set # CONFIG_CRYPTO_SERPENT is not set -# CONFIG_CRYPTO_AES_GENERIC is not set +# CONFIG_CRYPTO_AES is not set # CONFIG_CRYPTO_CAST5 is not set # CONFIG_CRYPTO_CAST6 is not set # CONFIG_CRYPTO_TEA is not set # CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_KHAZAD is not set # CONFIG_CRYPTO_DEFLATE is not set # CONFIG_CRYPTO_MICHAEL_MIC is not set # CONFIG_CRYPTO_CRC32C is not set diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c index f3464cc5c178e..5c0a63aff9393 100644 --- a/arch/s390/kernel/compat_linux.c +++ b/arch/s390/kernel/compat_linux.c @@ -725,8 +725,7 @@ sys32_rt_sigqueueinfo(int pid, int sig, siginfo_t32 __user *uinfo) int ret; mm_segment_t old_fs = get_fs(); - if (copy_from_user (&info, uinfo, 3*sizeof(int)) || - copy_from_user (info._sifields._pad, uinfo->_sifields._pad, SI_PAD_SIZE)) + if (copy_siginfo_from_user32(&info, uinfo)) return -EFAULT; set_fs (KERNEL_DS); ret = sys_rt_sigqueueinfo(pid, sig, &info); diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c index d9ccdbdc2c241..02d2179e40828 100644 --- a/arch/s390/kernel/vtime.c +++ b/arch/s390/kernel/vtime.c @@ -21,7 +21,7 @@ #include #include -#define VTIMER_MAGIC (0x4b87ad6e + 1) +#define VTIMER_MAGIC (TIMER_MAGIC + 1) static ext_int_info_t ext_int_info_timer; DEFINE_PER_CPU(struct vtimer_queue, virt_cpu_timer); diff --git a/include/asm-s390/timer.h b/include/asm-s390/timer.h index bb49c6999055e..454d1ea85c547 100644 --- a/include/asm-s390/timer.h +++ b/include/asm-s390/timer.h @@ -45,6 +45,4 @@ extern void add_virt_timer_periodic(void *new); extern int mod_virt_timer(struct vtimer_list *timer, __u64 expires); extern int del_virt_timer(struct vtimer_list *timer); -int stop_timers(void); - #endif -- 2.53.0