[PATCH] s390 update: compile fixes

Switch to @$(generate-asm-offsets.h) method to create the asm-offsets.h file,
fix signal dequeueing in the 31 bit emulation code and fix includes.

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 4189972ae52675de451ce137b45c37aa9924834d..c9a6950f195f4694984eaa3662f5b156714171e6 100644 (file)
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -17,9 +17,7 @@ LDFLAGS               := -m elf_s390
 OBJCOPYFLAGS   := -O binary
 LDFLAGS_vmlinux := -e start
 
-CFLAGS_PIPE := -pipe
-CFLAGS_NSR  := -fno-strength-reduce
-CFLAGS := $(CFLAGS) $(CFLAGS_PIPE) $(CFLAGS_NSR)
+CFLAGS += -pipe -fno-strength-reduce
 
 HEAD := arch/s390/kernel/head.o arch/s390/kernel/init_task.o
 
@@ -38,11 +36,24 @@ MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
 image: vmlinux 
        @$(MAKEBOOT) image
 
+install: vmlinux
+       @$(MAKEBOOT) BOOTIMAGE=image install
+
 archclean:
-       @$(MAKEBOOT) clean
-       $(MAKE) -C arch/$(ARCH)/kernel clean
 
 archmrproper:
 
-install: vmlinux
-       @$(MAKEBOOT) BOOTIMAGE=image install
+prepare: include/asm-$(ARCH)/offsets.h
+
+arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
+                                  include/config/MARKER
+
+include/asm-$(ARCH)/offsets.h.tmp: arch/$(ARCH)/kernel/asm-offsets.s
+       @$(generate-asm-offsets.h) < $< > $@
+
+include/asm-$(ARCH)/offsets.h: include/asm-$(ARCH)/offsets.h.tmp
+       @echo -n '  Generating $@'
+       @$(update-if-changed)
+
+CLEAN_FILES += include/asm-$(ARCH)/offsets.h.tmp \
+              include/asm-$(ARCH)/offsets.h

diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index 6a11c6d120aa0f546ba8f30d62f3ede117be3966..15c53283df3269a2e07eaf4148984f788565d9f6 100644 (file)
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -92,6 +92,7 @@ CONFIG_SCSI_LOGGING=y
 #
 # CONFIG_SCSI_7000FASST is not set
 # CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_DPT_I2O is not set
@@ -122,6 +123,7 @@ CONFIG_SCSI_LOGGING=y
 # CONFIG_SCSI_SYM53C416 is not set
 # CONFIG_SCSI_T128 is not set
 # CONFIG_SCSI_U14_34F is not set
+# CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
 
 #

diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index 839941e154d60741dedce85dc301ca418e29a276..490166a3f0f79fbff5252cbdc74133bbdf21131f 100644 (file)
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -19,26 +19,3 @@ obj-$(CONFIG_SMP)            += smp.o
 obj-$(CONFIG_REMOTE_DEBUG)     += gdb-stub.o #gdb-low.o 
 
 include $(TOPDIR)/Rules.make
-
-.PHONY: asm-offsets.h
-
-entry.S: asm-offsets.h
-
-asm-offsets.h: asm-offsets.c
-       $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -S $< -o - | grep -- "->" | \
-       (echo "#ifndef __ASM_OFFSETS_H__"; \
-        echo "#define __ASM_OFFSETS_H__"; \
-        echo "/*"; \
-        echo " * DO NOT MODIFY"; \
-        echo " *"; \
-        echo " * This file was generated by arch/s390/kernel/Makefile"; \
-        echo " */"; \
-        sed -e "s:^->\([^ ]*\) \([^ ]*\) \(.*\):#define \\1 \\2 /* \\3*/:" \
-            -e "s:->::"; \
-        echo "#endif" \
-       ) > asm-offsets.h
-
-clean:
-       rm -f asm-offsets.h
-
-

diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index fe8abc26f1df6172a97757274d8416ec7fbc5d7a..e3e1ce9efe9e8d4d9bbef0ead8eb59ef39359cc1 100644 (file)
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -17,8 +17,7 @@
 #include <asm/errno.h>
 #include <asm/ptrace.h>
 #include <asm/thread_info.h>
-
-#include "asm-offsets.h"
+#include <asm/offsets.h>
 
 /*
  * Stack layout for the system_call stack entry.

diff --git a/arch/s390x/Makefile b/arch/s390x/Makefile
index 524cc7efeb0a4a97a00d31db74ad6f2b69873ae1..ee6037868a4db261fd7ced7cb7b9ea8d29ea369d 100644 (file)
--- a/arch/s390x/Makefile
+++ b/arch/s390x/Makefile
@@ -18,9 +18,7 @@ OBJCOPYFLAGS  := -O binary
 LDFLAGS_vmlinux := -e start
 MODFLAGS += -fpic
 
-CFLAGS_PIPE := -pipe
-CFLAGS_NSR  := -fno-strength-reduce
-CFLAGS := $(CFLAGS) $(CFLAGS_PIPE) $(CFLAGS_NSR)
+CFLAGS += -pipe -fno-strength-reduce
 
 HEAD := arch/s390x/kernel/head.o arch/s390x/kernel/init_task.o
 
@@ -42,7 +40,20 @@ install: vmlinux
        @$(MAKEBOOT) BOOTIMAGE=image install
 
 archclean:
-       @$(MAKEBOOT) clean
-       $(MAKE) -C arch/$(ARCH)/kernel clean
 
 archmrproper:
+
+prepare: include/asm-$(ARCH)/offsets.h
+
+arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
+                                  include/config/MARKER
+
+include/asm-$(ARCH)/offsets.h.tmp: arch/$(ARCH)/kernel/asm-offsets.s
+       @$(generate-asm-offsets.h) < $< > $@
+
+include/asm-$(ARCH)/offsets.h: include/asm-$(ARCH)/offsets.h.tmp
+       @echo -n '  Generating $@'
+       @$(update-if-changed)
+
+CLEAN_FILES += include/asm-$(ARCH)/offsets.h.tmp \
+              include/asm-$(ARCH)/offsets.h

diff --git a/arch/s390x/defconfig b/arch/s390x/defconfig
index 9611d0f8be7b12658ada5c98714ae0e729bf2793..664114fd39678840a18e808defb81b26bf2812c0 100644 (file)
--- a/arch/s390x/defconfig
+++ b/arch/s390x/defconfig
@@ -93,6 +93,7 @@ CONFIG_SCSI_LOGGING=y
 #
 # CONFIG_SCSI_7000FASST is not set
 # CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_DPT_I2O is not set
@@ -123,6 +124,7 @@ CONFIG_SCSI_LOGGING=y
 # CONFIG_SCSI_SYM53C416 is not set
 # CONFIG_SCSI_T128 is not set
 # CONFIG_SCSI_U14_34F is not set
+# CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
 
 #

diff --git a/arch/s390x/kernel/Makefile b/arch/s390x/kernel/Makefile
index 09c0fcf2d6cbc21555c8fdd609ff6467baefa399..2da118443689a2ee0f7e96e6eb4a8402ebb31282 100644 (file)
--- a/arch/s390x/kernel/Makefile
+++ b/arch/s390x/kernel/Makefile
@@ -30,28 +30,3 @@ include $(TOPDIR)/Rules.make
 # This is just to get the dependencies...
 #
 binfmt_elf32.o:        $(TOPDIR)/fs/binfmt_elf.c
-
-.PHONY: asm-offsets.h
-
-entry.S: asm-offsets.h
-
-#
-# Automatic offset generation for assembler files.
-#
-asm-offsets.h: asm-offsets.c
-       $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -S $< -o - | grep -- "->" | \
-       (echo "#ifndef __ASM_OFFSETS_H__"; \
-        echo "#define __ASM_OFFSETS_H__"; \
-        echo "/*"; \
-        echo " * DO NOT MODIFY"; \
-        echo " *"; \
-        echo " * This file was generated by arch/s390/kernel/Makefile"; \
-        echo " */"; \
-        sed -e "s:^->\([^ ]*\) \([^ ]*\) \(.*\):#define \\1 \\2 /* \\3*/:" \
-            -e "s:->::"; \
-        echo "#endif" \
-       ) > asm-offsets.h
-
-clean:
-       rm -f asm-offsets.h
-

diff --git a/arch/s390x/kernel/entry.S b/arch/s390x/kernel/entry.S
index c16422ccc5e6e66851f5b5e6cfe5b887d631b5c0..ecf5328a251ceff6adf178f3d384faa07960a59b 100644 (file)
--- a/arch/s390x/kernel/entry.S
+++ b/arch/s390x/kernel/entry.S
@@ -17,8 +17,7 @@
 #include <asm/errno.h>
 #include <asm/ptrace.h>
 #include <asm/thread_info.h>
-
-#include "asm-offsets.h"
+#include <asm/offsets.h>
 
 /*
  * Stack layout for the system_call stack entry.

diff --git a/arch/s390x/kernel/ioctl32.c b/arch/s390x/kernel/ioctl32.c
index 1230140af5b417b2c92f3ea52964d31ceb2a2e4c..e6275a6cc9269b114b4fb9be61add0e6f8dc28ef 100644 (file)
--- a/arch/s390x/kernel/ioctl32.c
+++ b/arch/s390x/kernel/ioctl32.c
@@ -25,9 +25,9 @@
 #include <linux/ext2_fs.h>
 #include <linux/hdreg.h>
 #include <linux/if_bonding.h>
-#include <linux/loop.h>
 #include <linux/blkpg.h>
 #include <linux/blk.h>
+#include <linux/loop.h>
 #include <linux/elevator.h>
 #include <asm/types.h>
 #include <asm/uaccess.h>

diff --git a/arch/s390x/kernel/linux32.c b/arch/s390x/kernel/linux32.c
index 3ea9ee726ce5648c57ad0e40e9e6dd637f769d73..96cd8e21475685c7759691bfaa4219bab454cde4 100644 (file)
--- a/arch/s390x/kernel/linux32.c
+++ b/arch/s390x/kernel/linux32.c
@@ -1953,9 +1953,7 @@ sys32_rt_sigtimedwait(sigset_t32 *uthese, siginfo_t32 *uinfo,
        }
 
        spin_lock_irq(&current->sig->siglock);
-       sig = dequeue_signal(&current->sig->shared_pending, &these, &info);
-       if (!sig)
-               sig = dequeue_signal(&current->pending, &these, &info);
+       sig = dequeue_signal(&these, &info);
        if (!sig) {
                /* None ready -- temporarily unblock those we're interested
                   in so that we'll be awakened when they arrive.  */
@@ -1973,9 +1971,7 @@ sys32_rt_sigtimedwait(sigset_t32 *uthese, siginfo_t32 *uinfo,
                timeout = schedule_timeout(timeout);
 
                spin_lock_irq(&current->sig->siglock);
-               sig = dequeue_signal(&current->sig->shared_pending, &these, &info);
-               if (!sig)
-                       sig = dequeue_signal(&current->pending, &these, &info);
+               sig = dequeue_signal(&these, &info);
                current->blocked = current->real_blocked;
                siginitset(&current->real_blocked, 0);
                recalc_sigpending();

diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 1ff9bda8c1de004f20986e99429538a71e171ced..a44a4114eb1c8377b2b7083260256897dd26ee46 100644 (file)
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -1,7 +1,7 @@
 /*
  *  drivers/s390/cio/cio.c
  *   S/390 common I/O routines -- low level i/o calls
- *   $Revision: 1.26 $
+ *   $Revision: 1.27 $
  *
  *    Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
  *                            IBM Corporation
@@ -27,6 +27,7 @@
 #include "cio.h"
 #include "cio_debug.h"
 #include "ioinfo.h"
+#include "chsc.h"
 #include "s390io.h" /* FIXME: try to do without this */
 
 static atomic_t sync_isc = ATOMIC_INIT (-1);