Commit ca0c836d authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 updates from Martin Schwidefsky:
 "Bug fixes, small improvements and one notable change: the system call
  table and the unistd.h header are now generated automatically with a
  shell script from a text file"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/decompressor: discard __ksymtab and .eh_frame sections
  s390: fix handling of -1 in set{,fs}[gu]id16 syscalls
  s390/tools: generate header files in arch/s390/include/generated/
  s390/syscalls: use generated syscall_table.h and unistd.h header files
  s390/syscalls: add Makefile to generate system call header files
  s390/syscalls: add syscalltbl script
  s390/syscalls: add system call table
  s390/decompressor: swap .text and .rodata.compressed sections
  s390/sclp: fix .data section specification
  s390/ipl: avoid usage of __section(.data)
  s390/head: replace hard coded values with constants
  s390/disassembler: add generated gen_opcode_table tool to .gitignore
  s390: remove bogus system call table entries
  s390/kprobes: remove duplicate includes
  s390/dasd: Remove dead return code checks
  s390/dasd: Simplify code
  s390/vdso: revise CFI annotations of vDSO functions
  s390/kernel: emit CFI data in .debug_frame and discard .eh_frame sections
parents 255442c9 47d67fac
...@@ -88,9 +88,13 @@ KBUILD_CFLAGS += -DCC_USING_HOTPATCH ...@@ -88,9 +88,13 @@ KBUILD_CFLAGS += -DCC_USING_HOTPATCH
endif endif
endif endif
# Test CFI features of binutils
cfi := $(call as-instr,.cfi_startproc\n.cfi_val_offset 15$(comma)-160\n.cfi_endproc,-DCONFIG_AS_CFI_VAL_OFFSET=1)
KBUILD_CFLAGS += -mbackchain -msoft-float $(cflags-y) KBUILD_CFLAGS += -mbackchain -msoft-float $(cflags-y)
KBUILD_CFLAGS += -pipe -fno-strength-reduce -Wno-sign-compare KBUILD_CFLAGS += -pipe -fno-strength-reduce -Wno-sign-compare
KBUILD_AFLAGS += $(aflags-y) KBUILD_CFLAGS += -fno-asynchronous-unwind-tables $(cfi)
KBUILD_AFLAGS += $(aflags-y) $(cfi)
OBJCOPYFLAGS := -O binary OBJCOPYFLAGS := -O binary
...@@ -107,6 +111,7 @@ drivers-y += drivers/s390/ ...@@ -107,6 +111,7 @@ drivers-y += drivers/s390/
drivers-$(CONFIG_OPROFILE) += arch/s390/oprofile/ drivers-$(CONFIG_OPROFILE) += arch/s390/oprofile/
boot := arch/s390/boot boot := arch/s390/boot
syscalls := arch/s390/kernel/syscalls
tools := arch/s390/tools tools := arch/s390/tools
all: image bzImage all: image bzImage
...@@ -128,9 +133,12 @@ archclean: ...@@ -128,9 +133,12 @@ archclean:
$(Q)$(MAKE) $(clean)=$(boot) $(Q)$(MAKE) $(clean)=$(boot)
$(Q)$(MAKE) $(clean)=$(tools) $(Q)$(MAKE) $(clean)=$(tools)
archheaders:
$(Q)$(MAKE) $(build)=$(syscalls) uapi
archprepare: archprepare:
$(Q)$(MAKE) $(build)=$(tools) include/generated/facilities.h $(Q)$(MAKE) $(build)=$(syscalls) kapi
$(Q)$(MAKE) $(build)=$(tools) include/generated/dis.h $(Q)$(MAKE) $(build)=$(tools) kapi
# Don't use tabs in echo arguments # Don't use tabs in echo arguments
define archhelp define archhelp
......
...@@ -14,6 +14,7 @@ targets += misc.o piggy.o sizes.h head.o ...@@ -14,6 +14,7 @@ targets += misc.o piggy.o sizes.h head.o
KBUILD_CFLAGS := -m64 -D__KERNEL__ -O2 KBUILD_CFLAGS := -m64 -D__KERNEL__ -O2
KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY
KBUILD_CFLAGS += $(cflags-y) -fno-delete-null-pointer-checks -msoft-float KBUILD_CFLAGS += $(cflags-y) -fno-delete-null-pointer-checks -msoft-float
KBUILD_CFLAGS += -fno-asynchronous-unwind-tables
KBUILD_CFLAGS += $(call cc-option,-mpacked-stack) KBUILD_CFLAGS += $(call cc-option,-mpacked-stack)
KBUILD_CFLAGS += $(call cc-option,-ffreestanding) KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
......
...@@ -17,15 +17,15 @@ SECTIONS ...@@ -17,15 +17,15 @@ SECTIONS
HEAD_TEXT HEAD_TEXT
_ehead = . ; _ehead = . ;
} }
.rodata.compressed : {
*(.rodata.compressed)
}
.text : { .text : {
_text = .; /* Text */ _text = .; /* Text */
*(.text) *(.text)
*(.text.*) *(.text.*)
_etext = . ; _etext = . ;
} }
.rodata.compressed : {
*(.rodata.compressed)
}
.rodata : { .rodata : {
_rodata = . ; _rodata = . ;
*(.rodata) /* read-only data */ *(.rodata) /* read-only data */
...@@ -48,4 +48,10 @@ SECTIONS ...@@ -48,4 +48,10 @@ SECTIONS
_ebss = .; _ebss = .;
} }
_end = .; _end = .;
/* Sections to be discarded */
/DISCARD/ : {
*(.eh_frame)
*(*__ksymtab*)
}
} }
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
generated-y += dis-defs.h
generated-y += facility-defs.h
generated-y += syscall_table.h
generated-y += unistd_nr.h
generic-y += asm-offsets.h generic-y += asm-offsets.h
generic-y += cacheflush.h generic-y += cacheflush.h
generic-y += clkdev.h generic-y += clkdev.h
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#ifndef __ASM_S390_DIS_H__ #ifndef __ASM_S390_DIS_H__
#define __ASM_S390_DIS_H__ #define __ASM_S390_DIS_H__
#include <generated/dis.h> #include <asm/dis-defs.h>
static inline int insn_length(unsigned char code) static inline int insn_length(unsigned char code)
{ {
......
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_S390_DWARF_H
#define _ASM_S390_DWARF_H
#ifdef __ASSEMBLY__
#define CFI_STARTPROC .cfi_startproc
#define CFI_ENDPROC .cfi_endproc
#define CFI_DEF_CFA_OFFSET .cfi_def_cfa_offset
#define CFI_ADJUST_CFA_OFFSET .cfi_adjust_cfa_offset
#define CFI_RESTORE .cfi_restore
#ifdef CONFIG_AS_CFI_VAL_OFFSET
#define CFI_VAL_OFFSET .cfi_val_offset
#else
#define CFI_VAL_OFFSET #
#endif
#ifndef BUILD_VDSO
/*
* Emit CFI data in .debug_frame sections and not in .eh_frame
* sections. The .eh_frame CFI is used for runtime unwind
* information that is not being used. Hence, vmlinux.lds.S
* can discard the .eh_frame sections.
*/
.cfi_sections .debug_frame
#else
/*
* For vDSO, emit CFI data in both, .eh_frame and .debug_frame
* sections.
*/
.cfi_sections .eh_frame, .debug_frame
#endif
#endif /* __ASSEMBLY__ */
#endif /* _ASM_S390_DWARF_H */
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#ifndef __ASM_FACILITY_H #ifndef __ASM_FACILITY_H
#define __ASM_FACILITY_H #define __ASM_FACILITY_H
#include <generated/facilities.h> #include <asm/facility-defs.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/preempt.h> #include <linux/preempt.h>
#include <asm/lowcore.h> #include <asm/lowcore.h>
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#define _ASM_S390_UNISTD_H_ #define _ASM_S390_UNISTD_H_
#include <uapi/asm/unistd.h> #include <uapi/asm/unistd.h>
#include <asm/unistd_nr.h>
#define __IGNORE_time #define __IGNORE_time
#define __IGNORE_pkey_mprotect #define __IGNORE_pkey_mprotect
......
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
# UAPI Header export list # UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm include include/uapi/asm-generic/Kbuild.asm
generated-y += unistd_32.h
generated-y += unistd_64.h
generic-y += errno.h generic-y += errno.h
generic-y += fcntl.h generic-y += fcntl.h
generic-y += ioctl.h generic-y += ioctl.h
......
This diff is collapsed.
...@@ -110,7 +110,7 @@ COMPAT_SYSCALL_DEFINE2(s390_setregid16, u16, rgid, u16, egid) ...@@ -110,7 +110,7 @@ COMPAT_SYSCALL_DEFINE2(s390_setregid16, u16, rgid, u16, egid)
COMPAT_SYSCALL_DEFINE1(s390_setgid16, u16, gid) COMPAT_SYSCALL_DEFINE1(s390_setgid16, u16, gid)
{ {
return sys_setgid((gid_t)gid); return sys_setgid(low2highgid(gid));
} }
COMPAT_SYSCALL_DEFINE2(s390_setreuid16, u16, ruid, u16, euid) COMPAT_SYSCALL_DEFINE2(s390_setreuid16, u16, ruid, u16, euid)
...@@ -120,7 +120,7 @@ COMPAT_SYSCALL_DEFINE2(s390_setreuid16, u16, ruid, u16, euid) ...@@ -120,7 +120,7 @@ COMPAT_SYSCALL_DEFINE2(s390_setreuid16, u16, ruid, u16, euid)
COMPAT_SYSCALL_DEFINE1(s390_setuid16, u16, uid) COMPAT_SYSCALL_DEFINE1(s390_setuid16, u16, uid)
{ {
return sys_setuid((uid_t)uid); return sys_setuid(low2highuid(uid));
} }
COMPAT_SYSCALL_DEFINE3(s390_setresuid16, u16, ruid, u16, euid, u16, suid) COMPAT_SYSCALL_DEFINE3(s390_setresuid16, u16, ruid, u16, euid, u16, suid)
...@@ -173,12 +173,12 @@ COMPAT_SYSCALL_DEFINE3(s390_getresgid16, u16 __user *, rgidp, ...@@ -173,12 +173,12 @@ COMPAT_SYSCALL_DEFINE3(s390_getresgid16, u16 __user *, rgidp,
COMPAT_SYSCALL_DEFINE1(s390_setfsuid16, u16, uid) COMPAT_SYSCALL_DEFINE1(s390_setfsuid16, u16, uid)
{ {
return sys_setfsuid((uid_t)uid); return sys_setfsuid(low2highuid(uid));
} }
COMPAT_SYSCALL_DEFINE1(s390_setfsgid16, u16, gid) COMPAT_SYSCALL_DEFINE1(s390_setfsgid16, u16, gid)
{ {
return sys_setfsgid((gid_t)gid); return sys_setfsgid(low2highgid(gid));
} }
static int groups16_to_user(u16 __user *grouplist, struct group_info *group_info) static int groups16_to_user(u16 __user *grouplist, struct group_info *group_info)
......
...@@ -1392,7 +1392,7 @@ cleanup_critical: ...@@ -1392,7 +1392,7 @@ cleanup_critical:
#define SYSCALL(esame,emu) .long esame #define SYSCALL(esame,emu) .long esame
.globl sys_call_table .globl sys_call_table
sys_call_table: sys_call_table:
#include "syscalls.S" #include "asm/syscall_table.h"
#undef SYSCALL #undef SYSCALL
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
...@@ -1400,6 +1400,6 @@ sys_call_table: ...@@ -1400,6 +1400,6 @@ sys_call_table:
#define SYSCALL(esame,emu) .long emu #define SYSCALL(esame,emu) .long emu
.globl sys_call_table_emu .globl sys_call_table_emu
sys_call_table_emu: sys_call_table_emu:
#include "syscalls.S" #include "asm/syscall_table.h"
#undef SYSCALL #undef SYSCALL
#endif #endif
...@@ -66,7 +66,7 @@ __HEAD ...@@ -66,7 +66,7 @@ __HEAD
# subroutine to wait for end I/O # subroutine to wait for end I/O
# #
.Lirqwait: .Lirqwait:
mvc 0x1f0(16),.Lnewpsw # set up IO interrupt psw mvc __LC_IO_NEW_PSW(16),.Lnewpsw # set up IO interrupt psw
lpsw .Lwaitpsw lpsw .Lwaitpsw
.Lioint: .Lioint:
br %r14 br %r14
...@@ -98,7 +98,7 @@ __HEAD ...@@ -98,7 +98,7 @@ __HEAD
bnz .Llderr bnz .Llderr
.Lwait4irq: .Lwait4irq:
bas %r14,.Lirqwait bas %r14,.Lirqwait
c %r1,0xb8 # compare subchannel number c %r1,__LC_SUBCHANNEL_ID # compare subchannel number
bne .Lwait4irq bne .Lwait4irq
tsch 0(%r5) tsch 0(%r5)
...@@ -156,9 +156,9 @@ iplstart: ...@@ -156,9 +156,9 @@ iplstart:
.fill 16,4,0x0 .fill 16,4,0x0
0: lmh %r0,%r15,0(%r13) # clear high-order half of gprs 0: lmh %r0,%r15,0(%r13) # clear high-order half of gprs
sam31 # switch to 31 bit addressing mode sam31 # switch to 31 bit addressing mode
lh %r1,0xb8 # test if subchannel number lh %r1,__LC_SUBCHANNEL_ID # test if subchannel number
bct %r1,.Lnoload # is valid bct %r1,.Lnoload # is valid
l %r1,0xb8 # load ipl subchannel number l %r1,__LC_SUBCHANNEL_ID # load ipl subchannel number
la %r2,IPL_BS # load start address la %r2,IPL_BS # load start address
bas %r14,.Lloader # load rest of ipl image bas %r14,.Lloader # load rest of ipl image
l %r12,.Lparm # pointer to parameter area l %r12,.Lparm # pointer to parameter area
...@@ -239,7 +239,7 @@ iplstart: ...@@ -239,7 +239,7 @@ iplstart:
bz .Lnoreset bz .Lnoreset
.Lwaitforirq: .Lwaitforirq:
bas %r14,.Lirqwait # wait for IO interrupt bas %r14,.Lirqwait # wait for IO interrupt
c %r1,0xb8 # compare subchannel number c %r1,__LC_SUBCHANNEL_ID # compare subchannel number
bne .Lwaitforirq bne .Lwaitforirq
la %r5,.Lirb la %r5,.Lirb
tsch 0(%r5) tsch 0(%r5)
......
...@@ -119,13 +119,9 @@ static char *dump_type_str(enum dump_type type) ...@@ -119,13 +119,9 @@ static char *dump_type_str(enum dump_type type)
} }
} }
/* static u8 ipl_ssid;
* Must be in data section since the bss section static u16 ipl_devno;
* is not cleared when these are accessed. u32 ipl_flags;
*/
static u8 ipl_ssid __section(.data) = 0;
static u16 ipl_devno __section(.data) = 0;
u32 ipl_flags __section(.data) = 0;
enum ipl_method { enum ipl_method {
REIPL_METHOD_CCW_CIO, REIPL_METHOD_CCW_CIO,
...@@ -148,7 +144,7 @@ enum dump_method { ...@@ -148,7 +144,7 @@ enum dump_method {
DUMP_METHOD_FCP_DIAG, DUMP_METHOD_FCP_DIAG,
}; };
static int diag308_set_works = 0; static int diag308_set_works;
static struct ipl_parameter_block ipl_block; static struct ipl_parameter_block ipl_block;
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <linux/ftrace.h> #include <linux/ftrace.h>
#include <asm/set_memory.h> #include <asm/set_memory.h>
#include <asm/sections.h> #include <asm/sections.h>
#include <linux/uaccess.h>
#include <asm/dis.h> #include <asm/dis.h>
DEFINE_PER_CPU(struct kprobe *, current_kprobe); DEFINE_PER_CPU(struct kprobe *, current_kprobe);
......
This diff is collapsed.
# SPDX-License-Identifier: GPL-2.0
gen := arch/$(ARCH)/include/generated
kapi := $(gen)/asm
uapi := $(gen)/uapi/asm
syscall := $(srctree)/$(src)/syscall.tbl
systbl := $(srctree)/$(src)/syscalltbl
gen-y := $(kapi)/syscall_table.h
kapi-hdrs-y := $(kapi)/unistd_nr.h
uapi-hdrs-y := $(uapi)/unistd_32.h
uapi-hdrs-y += $(uapi)/unistd_64.h
targets += $(addprefix ../../../,$(gen-y) $(kapi-hdrs-y) $(uapi-hdrs-y))
PHONY += kapi uapi
kapi: $(gen-y) $(kapi-hdrs-y)
uapi: $(uapi-hdrs-y)
# Create output directory if not already present
_dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)') \
$(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)')
define filechk_syshdr
$(CONFIG_SHELL) '$(systbl)' -H -a $(syshdr_abi_$(basetarget)) -f "$2"
endef
define filechk_sysnr
$(CONFIG_SHELL) '$(systbl)' -N -a $(sysnr_abi_$(basetarget))
endef
define filechk_syscalls
$(CONFIG_SHELL) '$(systbl)' -S
endef
syshdr_abi_unistd_32 := common,32
$(uapi)/unistd_32.h: $(syscall) FORCE
$(call filechk,syshdr,$@)
syshdr_abi_unistd_64 := common,64
$(uapi)/unistd_64.h: $(syscall) FORCE
$(call filechk,syshdr,$@)
$(kapi)/syscall_table.h: $(syscall) FORCE
$(call filechk,syscalls)
sysnr_abi_unistd_nr := common,32,64
$(kapi)/unistd_nr.h: $(syscall) FORCE
$(call filechk,sysnr)
This diff is collapsed.
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
#
# Generate system call table and header files
#
# Copyright IBM Corp. 2018
# Author(s): Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
#
# File path to the system call table definition.
# You can set the path with the -i option. If omitted,
# system call table definitions are read from standard input.
#
SYSCALL_TBL=""
create_syscall_table_entries()
{
local nr abi name entry64 entry32 _ignore
local temp=$(mktemp ${TMPDIR:-/tmp}/syscalltbl-common.XXXXXXXXX)
(
#
# Initialize with 0 to create an NI_SYSCALL for 0
#
local prev_nr=0 prev_32=sys_ni_syscall prev_64=sys_ni_syscall
while read nr abi name entry64 entry32 _ignore; do
test x$entry32 = x- && entry32=sys_ni_syscall
test x$entry64 = x- && entry64=sys_ni_syscall
if test $prev_nr -eq $nr; then
#
# Same syscall but different ABI, just update
# the respective entry point
#
case $abi in
32)
prev_32=$entry32
;;
64)
prev_64=$entry64
;;
esac
continue;
else
printf "%d\t%s\t%s\n" $prev_nr $prev_64 $prev_32
fi
prev_nr=$nr
prev_64=$entry64
prev_32=$entry32
done
printf "%d\t%s\t%s\n" $prev_nr $prev_64 $prev_32
) >> $temp
#
# Check for duplicate syscall numbers
#
if ! cat $temp |cut -f1 |uniq -d 2>&1; then
echo "Error: generated system call table contains duplicate entries: $temp" >&2
exit 1
fi
#
# Generate syscall table
#
prev_nr=0
while read nr entry64 entry32; do
while test $prev_nr -lt $((nr - 1)); do
printf "NI_SYSCALL\n"
prev_nr=$((prev_nr + 1))
done
if test x$entry64 = xsys_ni_syscall &&
test x$entry32 = xsys_ni_syscall; then
printf "NI_SYSCALL\n"
else
printf "SYSCALL(%s,%s)\n" $entry64 $entry32
fi
prev_nr=$nr
done < $temp
rm $temp
}
generate_syscall_table()
{
cat <<-EoHEADER
/* SPDX-License-Identifier: GPL-2.0 */
/*
* Definitions for sys_call_table, each line represents an
* entry in the table in the form
* SYSCALL(64 bit syscall, 31 bit emulated syscall)
*
* This file is meant to be included from entry.S.
*/
#define NI_SYSCALL SYSCALL(sys_ni_syscall,sys_ni_syscall)
EoHEADER
grep -Ev '^(#|[[:blank:]]*$)' $SYSCALL_TBL \
|sort -k1 -n \
|create_syscall_table_entries
}
create_header_defines()
{
local nr abi name _ignore
while read nr abi name _ignore; do
printf "#define __NR_%s %d\n" $name $nr
done
}
normalize_fileguard()
{
local fileguard="$1"
echo "$1" |tr '[[:lower:]]' '[[:upper:]]' \
|sed -e 's/[^A-Z0-9_]/_/g' -e 's/__/_/g'
}
generate_syscall_header()
{
local abis=$(echo "($1)" | tr ',' '|')
local filename="$2"
local fileguard suffix
if test "$filename"; then
fileguard=$(normalize_fileguard "__UAPI_ASM_S390_$2")
else
case "$abis" in
*64*) suffix=64 ;;
*32*) suffix=32 ;;
esac
fileguard=$(normalize_fileguard "__UAPI_ASM_S390_SYSCALLS_$suffix")
fi
cat <<-EoHEADER
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
#ifndef ${fileguard}
#define ${fileguard}
EoHEADER
grep -E "^[[:digit:]]+[[:space:]]+${abis}" $SYSCALL_TBL \
|sort -k1 -n \
|create_header_defines
cat <<-EoFOOTER
#endif /* ${fileguard} */
EoFOOTER
}
__max_syscall_nr()
{
local abis=$(echo "($1)" | tr ',' '|')
grep -E "^[[:digit:]]+[[:space:]]+${abis}" $SYSCALL_TBL \
|sed -ne 's/^\([[:digit:]]*\)[[:space:]].*/\1/p' \
|sort -n \
|tail -1
}
generate_syscall_nr()
{
local abis="$1"
local max_syscall_nr num_syscalls
max_syscall_nr=$(__max_syscall_nr "$abis")
num_syscalls=$((max_syscall_nr + 1))
cat <<-EoHEADER
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
#ifndef __ASM_S390_SYSCALLS_NR
#define __ASM_S390_SYSCALLS_NR
#define NR_syscalls ${num_syscalls}
#endif /* __ASM_S390_SYSCALLS_NR */
EoHEADER
}
#
# Parse command line arguments
#
do_syscall_header=""
do_syscall_table=""
do_syscall_nr=""
output_file=""
abi_list="common,64"
filename=""
while getopts ":HNSXi:a:f:" arg; do
case $arg in
a)
abi_list="$OPTARG"
;;
i)
SYSCALL_TBL="$OPTARG"
;;
f)
filename=${OPTARG##*/}
;;
H)
do_syscall_header=1
;;
N)
do_syscall_nr=1
;;
S)
do_syscall_table=1
;;
X)
set -x
;;
:)
echo "Missing argument for -$OPTARG" >&2
exit 1
;;
\?)
echo "Invalid option specified" >&2
exit 1
;;
esac
done
test "$do_syscall_header" && generate_syscall_header "$abi_list" "$filename"
test "$do_syscall_table" && generate_syscall_table
test "$do_syscall_nr" && generate_syscall_nr "$abi_list"
exit 0
...@@ -10,6 +10,9 @@ obj-vdso32 = gettimeofday.o clock_getres.o clock_gettime.o note.o getcpu.o ...@@ -10,6 +10,9 @@ obj-vdso32 = gettimeofday.o clock_getres.o clock_gettime.o note.o getcpu.o
targets := $(obj-vdso32) vdso32.so vdso32.so.dbg targets := $(obj-vdso32) vdso32.so vdso32.so.dbg
obj-vdso32 := $(addprefix $(obj)/, $(obj-vdso32)) obj-vdso32 := $(addprefix $(obj)/, $(obj-vdso32))
KBUILD_AFLAGS += -DBUILD_VDSO
KBUILD_CFLAGS += -DBUILD_VDSO
KBUILD_AFLAGS_31 := $(filter-out -m64,$(KBUILD_AFLAGS)) KBUILD_AFLAGS_31 := $(filter-out -m64,$(KBUILD_AFLAGS))
KBUILD_AFLAGS_31 += -m31 -s KBUILD_AFLAGS_31 += -m31 -s
......
...@@ -9,13 +9,14 @@ ...@@ -9,13 +9,14 @@
#include <asm/vdso.h> #include <asm/vdso.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include <asm/dwarf.h>
.text .text
.align 4 .align 4
.globl __kernel_clock_getres .globl __kernel_clock_getres
.type __kernel_clock_getres,@function .type __kernel_clock_getres,@function
__kernel_clock_getres: __kernel_clock_getres:
.cfi_startproc CFI_STARTPROC
basr %r1,0 basr %r1,0
la %r1,4f-.(%r1) la %r1,4f-.(%r1)
chi %r2,__CLOCK_REALTIME chi %r2,__CLOCK_REALTIME
...@@ -37,7 +38,7 @@ __kernel_clock_getres: ...@@ -37,7 +38,7 @@ __kernel_clock_getres:
3: lhi %r1,__NR_clock_getres /* fallback to svc */ 3: lhi %r1,__NR_clock_getres /* fallback to svc */
svc 0 svc 0
br %r14 br %r14
CFI_ENDPROC
4: .long __CLOCK_REALTIME_RES 4: .long __CLOCK_REALTIME_RES
5: .long __CLOCK_COARSE_RES 5: .long __CLOCK_COARSE_RES
.cfi_endproc
.size __kernel_clock_getres,.-__kernel_clock_getres .size __kernel_clock_getres,.-__kernel_clock_getres
...@@ -9,14 +9,17 @@ ...@@ -9,14 +9,17 @@
#include <asm/vdso.h> #include <asm/vdso.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include <asm/dwarf.h>
.text .text
.align 4 .align 4
.globl __kernel_clock_gettime .globl __kernel_clock_gettime
.type __kernel_clock_gettime,@function .type __kernel_clock_gettime,@function
__kernel_clock_gettime: __kernel_clock_gettime:
.cfi_startproc CFI_STARTPROC
ahi %r15,-16 ahi %r15,-16
CFI_DEF_CFA_OFFSET 176
CFI_VAL_OFFSET 15, -160
basr %r5,0 basr %r5,0
0: al %r5,21f-0b(%r5) /* get &_vdso_data */ 0: al %r5,21f-0b(%r5) /* get &_vdso_data */
chi %r2,__CLOCK_REALTIME_COARSE chi %r2,__CLOCK_REALTIME_COARSE
...@@ -69,9 +72,13 @@ __kernel_clock_gettime: ...@@ -69,9 +72,13 @@ __kernel_clock_gettime:
st %r1,4(%r3) /* store tp->tv_nsec */ st %r1,4(%r3) /* store tp->tv_nsec */
lhi %r2,0 lhi %r2,0
ahi %r15,16 ahi %r15,16
CFI_DEF_CFA_OFFSET 160
CFI_RESTORE 15
br %r14 br %r14
/* CLOCK_MONOTONIC_COARSE */ /* CLOCK_MONOTONIC_COARSE */
CFI_DEF_CFA_OFFSET 176
CFI_VAL_OFFSET 15, -160
9: l %r4,__VDSO_UPD_COUNT+4(%r5) /* load update counter */ 9: l %r4,__VDSO_UPD_COUNT+4(%r5) /* load update counter */
tml %r4,0x0001 /* pending update ? loop */ tml %r4,0x0001 /* pending update ? loop */
jnz 9b jnz 9b
...@@ -151,15 +158,21 @@ __kernel_clock_gettime: ...@@ -151,15 +158,21 @@ __kernel_clock_gettime:
st %r1,4(%r3) /* store tp->tv_nsec */ st %r1,4(%r3) /* store tp->tv_nsec */
lhi %r2,0 lhi %r2,0
ahi %r15,16 ahi %r15,16
CFI_DEF_CFA_OFFSET 160
CFI_RESTORE 15
br %r14 br %r14
/* Fallback to system call */ /* Fallback to system call */
CFI_DEF_CFA_OFFSET 176
CFI_VAL_OFFSET 15, -160
19: lhi %r1,__NR_clock_gettime 19: lhi %r1,__NR_clock_gettime
svc 0 svc 0
ahi %r15,16 ahi %r15,16
CFI_DEF_CFA_OFFSET 160
CFI_RESTORE 15
br %r14 br %r14
CFI_ENDPROC
20: .long 1000000000 20: .long 1000000000
21: .long _vdso_data - 0b 21: .long _vdso_data - 0b
.cfi_endproc
.size __kernel_clock_gettime,.-__kernel_clock_gettime .size __kernel_clock_gettime,.-__kernel_clock_gettime
...@@ -8,13 +8,14 @@ ...@@ -8,13 +8,14 @@
*/ */
#include <asm/vdso.h> #include <asm/vdso.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/dwarf.h>
.text .text
.align 4 .align 4
.globl __kernel_getcpu .globl __kernel_getcpu
.type __kernel_getcpu,@function .type __kernel_getcpu,@function
__kernel_getcpu: __kernel_getcpu:
.cfi_startproc CFI_STARTPROC
la %r4,0 la %r4,0
sacf 256 sacf 256
l %r5,__VDSO_CPU_NR(%r4) l %r5,__VDSO_CPU_NR(%r4)
...@@ -28,5 +29,5 @@ __kernel_getcpu: ...@@ -28,5 +29,5 @@ __kernel_getcpu:
st %r4,0(%r3) st %r4,0(%r3)
3: lhi %r2,0 3: lhi %r2,0
br %r14 br %r14
.cfi_endproc CFI_ENDPROC
.size __kernel_getcpu,.-__kernel_getcpu .size __kernel_getcpu,.-__kernel_getcpu
...@@ -9,14 +9,17 @@ ...@@ -9,14 +9,17 @@
#include <asm/vdso.h> #include <asm/vdso.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include <asm/dwarf.h>
.text .text
.align 4 .align 4
.globl __kernel_gettimeofday .globl __kernel_gettimeofday
.type __kernel_gettimeofday,@function .type __kernel_gettimeofday,@function
__kernel_gettimeofday: __kernel_gettimeofday:
.cfi_startproc CFI_STARTPROC
ahi %r15,-16 ahi %r15,-16
CFI_ADJUST_CFA_OFFSET 16
CFI_VAL_OFFSET 15, -160
basr %r5,0 basr %r5,0
0: al %r5,13f-0b(%r5) /* get &_vdso_data */ 0: al %r5,13f-0b(%r5) /* get &_vdso_data */
1: ltr %r3,%r3 /* check if tz is NULL */ 1: ltr %r3,%r3 /* check if tz is NULL */
...@@ -89,9 +92,11 @@ __kernel_gettimeofday: ...@@ -89,9 +92,11 @@ __kernel_gettimeofday:
st %r0,4(%r2) /* store tv->tv_usec */ st %r0,4(%r2) /* store tv->tv_usec */
10: slr %r2,%r2 10: slr %r2,%r2
ahi %r15,16 ahi %r15,16
CFI_ADJUST_CFA_OFFSET -16
CFI_RESTORE 15
br %r14 br %r14
CFI_ENDPROC
11: .long 1000000000 11: .long 1000000000
12: .long 274877907 12: .long 274877907
13: .long _vdso_data - 0b 13: .long _vdso_data - 0b
.cfi_endproc
.size __kernel_gettimeofday,.-__kernel_gettimeofday .size __kernel_gettimeofday,.-__kernel_gettimeofday
...@@ -10,6 +10,9 @@ obj-vdso64 = gettimeofday.o clock_getres.o clock_gettime.o note.o getcpu.o ...@@ -10,6 +10,9 @@ obj-vdso64 = gettimeofday.o clock_getres.o clock_gettime.o note.o getcpu.o
targets := $(obj-vdso64) vdso64.so vdso64.so.dbg targets := $(obj-vdso64) vdso64.so vdso64.so.dbg
obj-vdso64 := $(addprefix $(obj)/, $(obj-vdso64)) obj-vdso64 := $(addprefix $(obj)/, $(obj-vdso64))
KBUILD_AFLAGS += -DBUILD_VDSO
KBUILD_CFLAGS += -DBUILD_VDSO
KBUILD_AFLAGS_64 := $(filter-out -m64,$(KBUILD_AFLAGS)) KBUILD_AFLAGS_64 := $(filter-out -m64,$(KBUILD_AFLAGS))
KBUILD_AFLAGS_64 += -m64 -s KBUILD_AFLAGS_64 += -m64 -s
......
...@@ -9,13 +9,14 @@ ...@@ -9,13 +9,14 @@
#include <asm/vdso.h> #include <asm/vdso.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include <asm/dwarf.h>
.text .text
.align 4 .align 4
.globl __kernel_clock_getres .globl __kernel_clock_getres
.type __kernel_clock_getres,@function .type __kernel_clock_getres,@function
__kernel_clock_getres: __kernel_clock_getres:
.cfi_startproc CFI_STARTPROC
larl %r1,4f larl %r1,4f
cghi %r2,__CLOCK_REALTIME_COARSE cghi %r2,__CLOCK_REALTIME_COARSE
je 0f je 0f
...@@ -43,7 +44,7 @@ __kernel_clock_getres: ...@@ -43,7 +44,7 @@ __kernel_clock_getres:
2: lghi %r1,__NR_clock_getres /* fallback to svc */ 2: lghi %r1,__NR_clock_getres /* fallback to svc */
svc 0 svc 0
br %r14 br %r14
CFI_ENDPROC
3: .quad __CLOCK_REALTIME_RES 3: .quad __CLOCK_REALTIME_RES
4: .quad __CLOCK_COARSE_RES 4: .quad __CLOCK_COARSE_RES
.cfi_endproc
.size __kernel_clock_getres,.-__kernel_clock_getres .size __kernel_clock_getres,.-__kernel_clock_getres
...@@ -9,14 +9,17 @@ ...@@ -9,14 +9,17 @@
#include <asm/vdso.h> #include <asm/vdso.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include <asm/dwarf.h>
.text .text
.align 4 .align 4
.globl __kernel_clock_gettime .globl __kernel_clock_gettime
.type __kernel_clock_gettime,@function .type __kernel_clock_gettime,@function
__kernel_clock_gettime: __kernel_clock_gettime:
.cfi_startproc CFI_STARTPROC
aghi %r15,-16 aghi %r15,-16
CFI_DEF_CFA_OFFSET 176
CFI_VAL_OFFSET 15, -160
larl %r5,_vdso_data larl %r5,_vdso_data
cghi %r2,__CLOCK_REALTIME_COARSE cghi %r2,__CLOCK_REALTIME_COARSE
je 4f je 4f
...@@ -53,9 +56,13 @@ __kernel_clock_gettime: ...@@ -53,9 +56,13 @@ __kernel_clock_gettime:
stg %r1,8(%r3) /* store tp->tv_nsec */ stg %r1,8(%r3) /* store tp->tv_nsec */
lghi %r2,0 lghi %r2,0
aghi %r15,16 aghi %r15,16
CFI_DEF_CFA_OFFSET 160
CFI_RESTORE 15
br %r14 br %r14
/* CLOCK_MONOTONIC_COARSE */ /* CLOCK_MONOTONIC_COARSE */
CFI_DEF_CFA_OFFSET 176
CFI_VAL_OFFSET 15, -160
3: lg %r4,__VDSO_UPD_COUNT(%r5) /* load update counter */ 3: lg %r4,__VDSO_UPD_COUNT(%r5) /* load update counter */
tmll %r4,0x0001 /* pending update ? loop */ tmll %r4,0x0001 /* pending update ? loop */
jnz 3b jnz 3b
...@@ -108,9 +115,13 @@ __kernel_clock_gettime: ...@@ -108,9 +115,13 @@ __kernel_clock_gettime:
stg %r1,8(%r3) /* store tp->tv_nsec */ stg %r1,8(%r3) /* store tp->tv_nsec */
lghi %r2,0 lghi %r2,0
aghi %r15,16 aghi %r15,16
CFI_DEF_CFA_OFFSET 160
CFI_RESTORE 15
br %r14 br %r14
/* CPUCLOCK_VIRT for this thread */ /* CPUCLOCK_VIRT for this thread */
CFI_DEF_CFA_OFFSET 176
CFI_VAL_OFFSET 15, -160
9: lghi %r4,0 9: lghi %r4,0
icm %r0,15,__VDSO_ECTG_OK(%r5) icm %r0,15,__VDSO_ECTG_OK(%r5)
jz 12f jz 12f
...@@ -131,15 +142,21 @@ __kernel_clock_gettime: ...@@ -131,15 +142,21 @@ __kernel_clock_gettime:
stg %r4,8(%r3) stg %r4,8(%r3)
lghi %r2,0 lghi %r2,0
aghi %r15,16 aghi %r15,16
CFI_DEF_CFA_OFFSET 160
CFI_RESTORE 15
br %r14 br %r14
/* Fallback to system call */ /* Fallback to system call */
CFI_DEF_CFA_OFFSET 176
CFI_VAL_OFFSET 15, -160
12: lghi %r1,__NR_clock_gettime 12: lghi %r1,__NR_clock_gettime
svc 0 svc 0
aghi %r15,16 aghi %r15,16
CFI_DEF_CFA_OFFSET 160
CFI_RESTORE 15
br %r14 br %r14
CFI_ENDPROC
13: .quad 1000000000 13: .quad 1000000000
14: .quad 19342813113834067 14: .quad 19342813113834067
.cfi_endproc
.size __kernel_clock_gettime,.-__kernel_clock_gettime .size __kernel_clock_gettime,.-__kernel_clock_gettime
...@@ -8,13 +8,14 @@ ...@@ -8,13 +8,14 @@
*/ */
#include <asm/vdso.h> #include <asm/vdso.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/dwarf.h>
.text .text
.align 4 .align 4
.globl __kernel_getcpu .globl __kernel_getcpu
.type __kernel_getcpu,@function .type __kernel_getcpu,@function
__kernel_getcpu: __kernel_getcpu:
.cfi_startproc CFI_STARTPROC
la %r4,0 la %r4,0
sacf 256 sacf 256
l %r5,__VDSO_CPU_NR(%r4) l %r5,__VDSO_CPU_NR(%r4)
...@@ -28,5 +29,5 @@ __kernel_getcpu: ...@@ -28,5 +29,5 @@ __kernel_getcpu:
st %r4,0(%r3) st %r4,0(%r3)
3: lghi %r2,0 3: lghi %r2,0
br %r14 br %r14
.cfi_endproc CFI_ENDPROC
.size __kernel_getcpu,.-__kernel_getcpu .size __kernel_getcpu,.-__kernel_getcpu
...@@ -9,14 +9,17 @@ ...@@ -9,14 +9,17 @@
#include <asm/vdso.h> #include <asm/vdso.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include <asm/dwarf.h>
.text .text
.align 4 .align 4
.globl __kernel_gettimeofday .globl __kernel_gettimeofday
.type __kernel_gettimeofday,@function .type __kernel_gettimeofday,@function
__kernel_gettimeofday: __kernel_gettimeofday:
.cfi_startproc CFI_STARTPROC
aghi %r15,-16 aghi %r15,-16
CFI_ADJUST_CFA_OFFSET 16
CFI_VAL_OFFSET 15, -160
larl %r5,_vdso_data larl %r5,_vdso_data
0: ltgr %r3,%r3 /* check if tz is NULL */ 0: ltgr %r3,%r3 /* check if tz is NULL */
je 1f je 1f
...@@ -58,8 +61,10 @@ __kernel_gettimeofday: ...@@ -58,8 +61,10 @@ __kernel_gettimeofday:
stg %r0,8(%r2) /* store tv->tv_usec */ stg %r0,8(%r2) /* store tv->tv_usec */
4: lghi %r2,0 4: lghi %r2,0
aghi %r15,16 aghi %r15,16
CFI_ADJUST_CFA_OFFSET -16
CFI_RESTORE 15
br %r14 br %r14
CFI_ENDPROC
5: .quad 1000000000 5: .quad 1000000000
.long 274877907 .long 274877907
.cfi_endproc
.size __kernel_gettimeofday,.-__kernel_gettimeofday .size __kernel_gettimeofday,.-__kernel_gettimeofday
...@@ -141,4 +141,7 @@ SECTIONS ...@@ -141,4 +141,7 @@ SECTIONS
/* Sections to be discarded */ /* Sections to be discarded */
DISCARDS DISCARDS
/DISCARD/ : {
*(.eh_frame)
}
} }
gen_facilities gen_facilities
gen_opcode_table
...@@ -3,22 +3,33 @@ ...@@ -3,22 +3,33 @@
# Makefile for s390 specific build tools # Makefile for s390 specific build tools
# #
kapi := arch/$(ARCH)/include/generated/asm
kapi-hdrs-y := $(kapi)/facility-defs.h $(kapi)/dis-defs.h
targets += $(addprefix ../../../,$(kapi-hdrs-y))
PHONY += kapi
kapi: $(kapi-hdrs-y)
hostprogs-y += gen_facilities hostprogs-y += gen_facilities
hostprogs-y += gen_opcode_table hostprogs-y += gen_opcode_table
HOSTCFLAGS_gen_facilities.o += -Wall $(LINUXINCLUDE) HOSTCFLAGS_gen_facilities.o += -Wall $(LINUXINCLUDE)
HOSTCFLAGS_gen_opcode_table.o += -Wall $(LINUXINCLUDE) HOSTCFLAGS_gen_opcode_table.o += -Wall $(LINUXINCLUDE)
define filechk_facilities.h # Ensure output directory exists
_dummy := $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)')
define filechk_facility-defs.h
$(obj)/gen_facilities $(obj)/gen_facilities
endef endef
define filechk_dis.h define filechk_dis-defs.h
( $(obj)/gen_opcode_table < $(srctree)/arch/$(ARCH)/tools/opcodes.txt ) ( $(obj)/gen_opcode_table < $(srctree)/arch/$(ARCH)/tools/opcodes.txt )
endef endef
include/generated/facilities.h: $(obj)/gen_facilities FORCE $(kapi)/facility-defs.h: $(obj)/gen_facilities FORCE
$(call filechk,facilities.h) $(call filechk,facility-defs.h)
include/generated/dis.h: $(obj)/gen_opcode_table FORCE $(kapi)/dis-defs.h: $(obj)/gen_opcode_table FORCE
$(call filechk,dis.h) $(call filechk,dis-defs.h)
...@@ -128,8 +128,8 @@ static void print_facility_lists(void) ...@@ -128,8 +128,8 @@ static void print_facility_lists(void)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
printf("#ifndef __ASM_S390_FACILITIES__\n"); printf("#ifndef __ASM_S390_FACILITY_DEFS__\n");
printf("#define __ASM_S390_FACILITIES__\n"); printf("#define __ASM_S390_FACILITY_DEFS__\n");
printf("/*\n"); printf("/*\n");
printf(" * DO NOT MODIFY.\n"); printf(" * DO NOT MODIFY.\n");
printf(" *\n"); printf(" *\n");
......
...@@ -321,8 +321,8 @@ int main(int argc, char **argv) ...@@ -321,8 +321,8 @@ int main(int argc, char **argv)
struct gen_opcode *desc = &_desc; struct gen_opcode *desc = &_desc;
read_instructions(desc); read_instructions(desc);
printf("#ifndef __S390_GENERATED_DIS_H__\n"); printf("#ifndef __S390_GENERATED_DIS_DEFS_H__\n");
printf("#define __S390_GENERATED_DIS_H__\n"); printf("#define __S390_GENERATED_DIS_DEFS_H__\n");
printf("/*\n"); printf("/*\n");
printf(" * DO NOT MODIFY.\n"); printf(" * DO NOT MODIFY.\n");
printf(" *\n"); printf(" *\n");
......
...@@ -1393,10 +1393,6 @@ int dasd_term_IO(struct dasd_ccw_req *cqr) ...@@ -1393,10 +1393,6 @@ int dasd_term_IO(struct dasd_ccw_req *cqr)
DBF_DEV_EVENT(DBF_ERR, device, "%s", DBF_DEV_EVENT(DBF_ERR, device, "%s",
"device gone, retry"); "device gone, retry");
break; break;
case -EIO:
DBF_DEV_EVENT(DBF_ERR, device, "%s",
"I/O error, retry");
break;
case -EINVAL: case -EINVAL:
/* /*
* device not valid so no I/O could be running * device not valid so no I/O could be running
...@@ -1412,10 +1408,6 @@ int dasd_term_IO(struct dasd_ccw_req *cqr) ...@@ -1412,10 +1408,6 @@ int dasd_term_IO(struct dasd_ccw_req *cqr)
/* fake rc to success */ /* fake rc to success */
rc = 0; rc = 0;
break; break;
case -EBUSY:
DBF_DEV_EVENT(DBF_ERR, device, "%s",
"device busy, retry later");
break;
default: default:
/* internal error 10 - unknown rc*/ /* internal error 10 - unknown rc*/
snprintf(errorstring, ERRORLENGTH, "10 %d", rc); snprintf(errorstring, ERRORLENGTH, "10 %d", rc);
...@@ -1489,10 +1481,6 @@ int dasd_start_IO(struct dasd_ccw_req *cqr) ...@@ -1489,10 +1481,6 @@ int dasd_start_IO(struct dasd_ccw_req *cqr)
DBF_DEV_EVENT(DBF_WARNING, device, "%s", DBF_DEV_EVENT(DBF_WARNING, device, "%s",
"start_IO: device busy, retry later"); "start_IO: device busy, retry later");
break; break;
case -ETIMEDOUT:
DBF_DEV_EVENT(DBF_WARNING, device, "%s",
"start_IO: request timeout, retry later");
break;
case -EACCES: case -EACCES:
/* -EACCES indicates that the request used only a subset of the /* -EACCES indicates that the request used only a subset of the
* available paths and all these paths are gone. If the lpm of * available paths and all these paths are gone. If the lpm of
......
...@@ -5231,7 +5231,7 @@ static int dasd_hosts_print(struct dasd_device *device, struct seq_file *m) ...@@ -5231,7 +5231,7 @@ static int dasd_hosts_print(struct dasd_device *device, struct seq_file *m)
struct dasd_ckd_path_group_entry *entry; struct dasd_ckd_path_group_entry *entry;
struct dasd_ckd_host_information *info; struct dasd_ckd_host_information *info;
char sysplex[9] = ""; char sysplex[9] = "";
int rc, i, j; int rc, i;
access = kzalloc(sizeof(*access), GFP_NOIO); access = kzalloc(sizeof(*access), GFP_NOIO);
if (!access) { if (!access) {
...@@ -5251,10 +5251,7 @@ static int dasd_hosts_print(struct dasd_device *device, struct seq_file *m) ...@@ -5251,10 +5251,7 @@ static int dasd_hosts_print(struct dasd_device *device, struct seq_file *m)
entry = (struct dasd_ckd_path_group_entry *) entry = (struct dasd_ckd_path_group_entry *)
(info->entry + i * info->entry_size); (info->entry + i * info->entry_size);
/* PGID */ /* PGID */
seq_puts(m, "pgid "); seq_printf(m, "pgid %*phN\n", 11, entry->pgid);
for (j = 0; j < 11; j++)
seq_printf(m, "%02x", entry->pgid[j]);
seq_putc(m, '\n');
/* FLAGS */ /* FLAGS */
seq_printf(m, "status_flags %02x\n", entry->status_flags); seq_printf(m, "status_flags %02x\n", entry->status_flags);
/* SYSPLEX NAME */ /* SYSPLEX NAME */
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
#include "sclp.h" #include "sclp.h"
#include "sclp_rw.h" #include "sclp_rw.h"
char sclp_early_sccb[PAGE_SIZE] __aligned(PAGE_SIZE) __section(data); char sclp_early_sccb[PAGE_SIZE] __aligned(PAGE_SIZE) __section(.data);
int sclp_init_state __section(data) = sclp_init_state_uninitialized; int sclp_init_state __section(.data) = sclp_init_state_uninitialized;
void sclp_early_wait_irq(void) void sclp_early_wait_irq(void)
{ {
......
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