[PATCH] s390: general update.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

s390 general update:

- Add archhelp for "make image".

- 32-bit execve fix.

- Export some symbols: sys_ioctl, put_files_struct & ccw_device_work.

- Minor cleanups in arch/s390/mm/init.c & drivers/s390/net/ctctty.c.

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 81250a2008ff2cb0880260ba90bf9c979e822146..d18a5731e31fa7961ce4131b7813e6ff9c4541e0 100644 (file)
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -70,3 +70,8 @@ include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
        $(call filechk,gen-asm-offsets)
 
 CLEAN_FILES += include/asm-$(ARCH)/offsets.h
+
+# Don't use tabs in echo arguments
+define archhelp
+  echo  '* image           - Kernel image for IPL ($(boot)/image)'
+endef

diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index ce3b02fbb3d9b62d465495fd862e67bd5d5c70aa..948d0185779a3ab22c7acdda028e46920bb0e09b 100644 (file)
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -147,6 +147,7 @@ CONFIG_MD_LINEAR=m
 CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID5=m
+# CONFIG_MD_RAID6 is not set
 CONFIG_MD_MULTIPATH=m
 # CONFIG_BLK_DEV_DM is not set
 

diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index 777ce28f83439487712ef5677a775c36e2c0c641..29c533625f7794fbff7ef0c8a56c68875e27bacc 100644 (file)
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -1912,7 +1912,8 @@ out:
                security_bprm_free(&bprm);
 
 out_mm:
-       mmdrop(bprm.mm);
+       if (bprm.mm)
+               mmdrop(bprm.mm);
 
 out_file:
        if (bprm.file) {

diff --git a/arch/s390/kernel/s390_ksyms.c b/arch/s390/kernel/s390_ksyms.c
index 39f83cbbebd2652e70a4c087cdba04fd69720b4d..478425fe8de45d1de9a1d3d81ae9ea1af3c0327c 100644 (file)
--- a/arch/s390/kernel/s390_ksyms.c
+++ b/arch/s390/kernel/s390_ksyms.c
@@ -9,6 +9,7 @@
 #include <linux/mm.h>
 #include <linux/smp.h>
 #include <linux/interrupt.h>
+#include <linux/ioctl32.h>
 #include <asm/checksum.h>
 #include <asm/cpcmd.h>
 #include <asm/delay.h>
@@ -74,4 +75,5 @@ EXPORT_SYMBOL(console_device);
 EXPORT_SYMBOL_NOVERS(do_call_softirq);
 EXPORT_SYMBOL(sys_wait4);
 EXPORT_SYMBOL(cpcmd);
+EXPORT_SYMBOL(sys_ioctl);
 

diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index ab0e614f77fc8092c9a1bb690daa3c894a6b85d0..b894f76f377de464a1069102e2f15db88cab5dd0 100644 (file)
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -79,8 +79,6 @@ extern unsigned long __init_end;
  * paging_init() sets up the page tables
  */
 
-unsigned long last_valid_pfn;
-
 #ifndef CONFIG_ARCH_S390X
 void __init paging_init(void)
 {

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 62626570877734190da2093406696b72207ec9a8..dfcf653965058da60e51c034c01d89152b866f01 100644 (file)
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -908,3 +908,4 @@ EXPORT_SYMBOL(ccw_driver_register);
 EXPORT_SYMBOL(ccw_driver_unregister);
 EXPORT_SYMBOL(get_ccwdev_by_busid);
 EXPORT_SYMBOL(ccw_bus_type);
+EXPORT_SYMBOL(ccw_device_work);

diff --git a/drivers/s390/net/ctctty.c b/drivers/s390/net/ctctty.c
index 4c9aae83fb818cd2490442a141b94dc3dad1d743..1be60e7bbc4e0977cad99cd5c78c4e98e92696cb 100644 (file)
--- a/drivers/s390/net/ctctty.c
+++ b/drivers/s390/net/ctctty.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ctctty.c,v 1.14 2003/10/06 11:33:33 mschwide Exp $
+ * $Id: ctctty.c,v 1.15 2004/01/26 10:21:01 mschwide Exp $
  *
  * CTC / ESCON network driver, tty interface.
  *
@@ -759,9 +759,7 @@ ctc_tty_ioctl(struct tty_struct *tty, struct file *file,
                               info->line);
 #endif
                        error = put_user(C_CLOCAL(tty) ? 1 : 0, (ulong *) arg);
-                       if (error)
-                               return error;
-                       return 0;
+                       return error;
                case TIOCSSOFTCAR:
 #ifdef CTC_DEBUG_MODEM_IOCTL
                        printk(KERN_DEBUG "%s%d ioctl TIOCSSOFTCAR\n", CTC_TTY_NAME,

diff --git a/kernel/exit.c b/kernel/exit.c
index 34956331ad0f078d60f1b007b0be6fec3233d0a1..374b01755aa4ae6776fa0f747c00611f02735794 100644 (file)
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -403,6 +403,8 @@ void put_files_struct(struct files_struct *files)
        }
 }
 
+EXPORT_SYMBOL(put_files_struct);
+
 static inline void __exit_files(struct task_struct *tsk)
 {
        struct files_struct * files = tsk->files;