Skip to content

L
linux
Commit fea7f50e authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Linus Torvalds
Browse files
Options

[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.
parent f355ae1c
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 72 deletions
arch/s390/Makefile
View file @ fea7f50e
...@@ -17,9 +17,7 @@ LDFLAGS := -m elf_s390 ...@@ -17,9 +17,7 @@ LDFLAGS := -m elf_s390
OBJCOPYFLAGS := -O binary OBJCOPYFLAGS := -O binary
LDFLAGS_vmlinux := -e start LDFLAGS_vmlinux := -e start
CFLAGS_PIPE := -pipe CFLAGS += -pipe -fno-strength-reduce
CFLAGS_NSR := -fno-strength-reduce
CFLAGS := $(CFLAGS) $(CFLAGS_PIPE) $(CFLAGS_NSR)
HEAD := arch/s390/kernel/head.o arch/s390/kernel/init_task.o HEAD := arch/s390/kernel/head.o arch/s390/kernel/init_task.o
...@@ -38,11 +36,24 @@ MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot ...@@ -38,11 +36,24 @@ MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
image: vmlinux image: vmlinux
@$(MAKEBOOT) image @$(MAKEBOOT) image
install: vmlinux
@$(MAKEBOOT) BOOTIMAGE=image install
archclean: archclean:
@$(MAKEBOOT) clean
$(MAKE) -C arch/$(ARCH)/kernel clean
archmrproper: archmrproper:
install: vmlinux prepare: include/asm-$(ARCH)/offsets.h
@$(MAKEBOOT) BOOTIMAGE=image install
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
arch/s390/defconfig
View file @ fea7f50e
...@@ -92,6 +92,7 @@ CONFIG_SCSI_LOGGING=y ...@@ -92,6 +92,7 @@ CONFIG_SCSI_LOGGING=y
# #
# CONFIG_SCSI_7000FASST is not set # CONFIG_SCSI_7000FASST is not set
# CONFIG_SCSI_ACARD is not set # CONFIG_SCSI_ACARD is not set
# CONFIG_SCSI_AACRAID is not set
# CONFIG_SCSI_AIC7XXX is not set # CONFIG_SCSI_AIC7XXX is not set
# CONFIG_SCSI_AIC7XXX_OLD is not set # CONFIG_SCSI_AIC7XXX_OLD is not set
# CONFIG_SCSI_DPT_I2O is not set # CONFIG_SCSI_DPT_I2O is not set
...@@ -122,6 +123,7 @@ CONFIG_SCSI_LOGGING=y ...@@ -122,6 +123,7 @@ CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_SYM53C416 is not set # CONFIG_SCSI_SYM53C416 is not set
# CONFIG_SCSI_T128 is not set # CONFIG_SCSI_T128 is not set
# CONFIG_SCSI_U14_34F is not set # CONFIG_SCSI_U14_34F is not set
# CONFIG_SCSI_NSP32 is not set
# CONFIG_SCSI_DEBUG is not set # CONFIG_SCSI_DEBUG is not set
# #
......
arch/s390/kernel/Makefile
View file @ fea7f50e
...@@ -19,26 +19,3 @@ obj-$(CONFIG_SMP) += smp.o ...@@ -19,26 +19,3 @@ obj-$(CONFIG_SMP) += smp.o
obj-$(CONFIG_REMOTE_DEBUG) += gdb-stub.o #gdb-low.o obj-$(CONFIG_REMOTE_DEBUG) += gdb-stub.o #gdb-low.o
include $(TOPDIR)/Rules.make 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
arch/s390/kernel/entry.S
View file @ fea7f50e
...@@ -17,8 +17,7 @@ ...@@ -17,8 +17,7 @@
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/offsets.h>
#include "asm-offsets.h"
/* /*
* Stack layout for the system_call stack entry. * Stack layout for the system_call stack entry.
......
arch/s390x/Makefile
View file @ fea7f50e
...@@ -18,9 +18,7 @@ OBJCOPYFLAGS := -O binary ...@@ -18,9 +18,7 @@ OBJCOPYFLAGS := -O binary
LDFLAGS_vmlinux := -e start LDFLAGS_vmlinux := -e start
MODFLAGS += -fpic MODFLAGS += -fpic
CFLAGS_PIPE := -pipe CFLAGS += -pipe -fno-strength-reduce
CFLAGS_NSR := -fno-strength-reduce
CFLAGS := $(CFLAGS) $(CFLAGS_PIPE) $(CFLAGS_NSR)
HEAD := arch/s390x/kernel/head.o arch/s390x/kernel/init_task.o HEAD := arch/s390x/kernel/head.o arch/s390x/kernel/init_task.o
...@@ -42,7 +40,20 @@ install: vmlinux ...@@ -42,7 +40,20 @@ install: vmlinux
@$(MAKEBOOT) BOOTIMAGE=image install @$(MAKEBOOT) BOOTIMAGE=image install
archclean: archclean:
@$(MAKEBOOT) clean
$(MAKE) -C arch/$(ARCH)/kernel clean
archmrproper: 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
arch/s390x/defconfig
View file @ fea7f50e
...@@ -93,6 +93,7 @@ CONFIG_SCSI_LOGGING=y ...@@ -93,6 +93,7 @@ CONFIG_SCSI_LOGGING=y
# #
# CONFIG_SCSI_7000FASST is not set # CONFIG_SCSI_7000FASST is not set
# CONFIG_SCSI_ACARD is not set # CONFIG_SCSI_ACARD is not set
# CONFIG_SCSI_AACRAID is not set
# CONFIG_SCSI_AIC7XXX is not set # CONFIG_SCSI_AIC7XXX is not set
# CONFIG_SCSI_AIC7XXX_OLD is not set # CONFIG_SCSI_AIC7XXX_OLD is not set
# CONFIG_SCSI_DPT_I2O is not set # CONFIG_SCSI_DPT_I2O is not set
...@@ -123,6 +124,7 @@ CONFIG_SCSI_LOGGING=y ...@@ -123,6 +124,7 @@ CONFIG_SCSI_LOGGING=y
# CONFIG_SCSI_SYM53C416 is not set # CONFIG_SCSI_SYM53C416 is not set
# CONFIG_SCSI_T128 is not set # CONFIG_SCSI_T128 is not set
# CONFIG_SCSI_U14_34F is not set # CONFIG_SCSI_U14_34F is not set
# CONFIG_SCSI_NSP32 is not set
# CONFIG_SCSI_DEBUG is not set # CONFIG_SCSI_DEBUG is not set
# #
......
arch/s390x/kernel/Makefile
View file @ fea7f50e
...@@ -30,28 +30,3 @@ include $(TOPDIR)/Rules.make ...@@ -30,28 +30,3 @@ include $(TOPDIR)/Rules.make
# This is just to get the dependencies... # This is just to get the dependencies...
# #
binfmt_elf32.o: $(TOPDIR)/fs/binfmt_elf.c 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
arch/s390x/kernel/entry.S
View file @ fea7f50e
...@@ -17,8 +17,7 @@ ...@@ -17,8 +17,7 @@
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/offsets.h>
#include "asm-offsets.h"
/* /*
* Stack layout for the system_call stack entry. * Stack layout for the system_call stack entry.
......
arch/s390x/kernel/ioctl32.c
View file @ fea7f50e
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
#include <linux/ext2_fs.h> #include <linux/ext2_fs.h>
#include <linux/hdreg.h> #include <linux/hdreg.h>
#include <linux/if_bonding.h> #include <linux/if_bonding.h>
#include <linux/loop.h>
#include <linux/blkpg.h> #include <linux/blkpg.h>
#include <linux/blk.h> #include <linux/blk.h>
#include <linux/loop.h>
#include <linux/elevator.h> #include <linux/elevator.h>
#include <asm/types.h> #include <asm/types.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
......
arch/s390x/kernel/linux32.c
View file @ fea7f50e
...@@ -1953,9 +1953,7 @@ sys32_rt_sigtimedwait(sigset_t32 *uthese, siginfo_t32 *uinfo, ...@@ -1953,9 +1953,7 @@ sys32_rt_sigtimedwait(sigset_t32 *uthese, siginfo_t32 *uinfo,
} }
spin_lock_irq(&current->sig->siglock); spin_lock_irq(&current->sig->siglock);
sig = dequeue_signal(&current->sig->shared_pending, &these, &info); sig = dequeue_signal(&these, &info);
if (!sig)
sig = dequeue_signal(&current->pending, &these, &info);
if (!sig) { if (!sig) {
/* None ready -- temporarily unblock those we're interested /* None ready -- temporarily unblock those we're interested
in so that we'll be awakened when they arrive. */ in so that we'll be awakened when they arrive. */
...@@ -1973,9 +1971,7 @@ sys32_rt_sigtimedwait(sigset_t32 *uthese, siginfo_t32 *uinfo, ...@@ -1973,9 +1971,7 @@ sys32_rt_sigtimedwait(sigset_t32 *uthese, siginfo_t32 *uinfo,
timeout = schedule_timeout(timeout); timeout = schedule_timeout(timeout);
spin_lock_irq(&current->sig->siglock); spin_lock_irq(&current->sig->siglock);
sig = dequeue_signal(&current->sig->shared_pending, &these, &info); sig = dequeue_signal(&these, &info);
if (!sig)
sig = dequeue_signal(&current->pending, &these, &info);
current->blocked = current->real_blocked; current->blocked = current->real_blocked;
siginitset(&current->real_blocked, 0); siginitset(&current->real_blocked, 0);
recalc_sigpending(); recalc_sigpending();
......
drivers/s390/cio/cio.c
View file @ fea7f50e
/* /*
* drivers/s390/cio/cio.c * drivers/s390/cio/cio.c
* S/390 common I/O routines -- low level i/o calls * 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, * Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
* IBM Corporation * IBM Corporation
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "cio.h" #include "cio.h"
#include "cio_debug.h" #include "cio_debug.h"
#include "ioinfo.h" #include "ioinfo.h"
#include "chsc.h"
#include "s390io.h" /* FIXME: try to do without this */ #include "s390io.h" /* FIXME: try to do without this */
static atomic_t sync_isc = ATOMIC_INIT (-1); static atomic_t sync_isc = ATOMIC_INIT (-1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7