Skip to content

Commit 834bf64

Browse files
Martin SchwidefskyLinus Torvalds
Martin Schwidefsky
authored and
Linus Torvalds
committed
[PATCH] s390 (1/7): base patch.
 - Makefile fix: default make target builds the kernel image. - Add export statement for cpcmd. - Add tgkill system call. - Reserve system call number for vserver.
1 parent ad4341e commit 834bf64

File tree

6 files changed

+20
-17
lines changed

6 files changed

+20
-17
lines changed

‎arch/s390/Makefile

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,18 @@ libs-y += arch/$(ARCH)/lib/
4848
drivers-y += drivers/s390/
4949
drivers-$(CONFIG_MATHEMU) += arch/$(ARCH)/math-emu/
5050

51+
boot := arch/$(ARCH)/boot
5152

52-
makeboot =$(Q)$(MAKE) -f scripts/Makefile.build obj=arch/$(ARCH)/boot $(1)
53-
54-
all: image listing
55-
56-
listing image: vmlinux
57-
$(call makeboot,arch/$(ARCH)/boot/$@)
53+
all: image
5854

5955
install: vmlinux
60-
$(call makeboot, $@)
56+
$(Q)$(MAKE) $(build)=$(boot) $@
6157

62-
archclean:
63-
$(Q)$(MAKE) -f scripts/Makefile.clean obj=arch/$(ARCH)/boot
58+
image: vmlinux
59+
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
6460

61+
archclean:
62+
$(Q)$(MAKE) $(clean)=$(boot)
6563

6664
prepare: include/asm-$(ARCH)/offsets.h
6765

‎arch/s390/boot/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ COMPILE_VERSION := __linux_compile_version_id__`hostname | \
66
tr -c '[0-9A-Za-z]' '_'`__`date | \
77
tr -c '[0-9A-Za-z]' '_'`_t
88

9-
EXTRA_CFLAGS := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I .
9+
EXTRA_CFLAGS := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I.
1010

1111
targets := image
1212

‎arch/s390/kernel/s390_ksyms.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <linux/smp.h>
1111
#include <linux/interrupt.h>
1212
#include <asm/checksum.h>
13+
#include <asm/cpcmd.h>
1314
#include <asm/delay.h>
1415
#include <asm/pgalloc.h>
1516
#include <asm/setup.h>
@@ -72,3 +73,5 @@ EXPORT_SYMBOL(console_mode);
7273
EXPORT_SYMBOL(console_device);
7374
EXPORT_SYMBOL_NOVERS(do_call_softirq);
7475
EXPORT_SYMBOL(sys_wait4);
76+
EXPORT_SYMBOL(cpcmd);
77+

‎arch/s390/kernel/syscalls.S

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ SYSCALL(sys_tkill,sys_tkill,sys_tkill)
249249
SYSCALL(sys_futex,sys_futex,compat_sys_futex_wrapper)
250250
SYSCALL(sys_sched_setaffinity,sys_sched_setaffinity,sys32_sched_setaffinity_wrapper)
251251
SYSCALL(sys_sched_getaffinity,sys_sched_getaffinity,sys32_sched_getaffinity_wrapper) /* 240 */
252-
NI_SYSCALL
252+
SYSCALL(sys_tgkill,sys_tgkill,sys_tgkill)
253253
NI_SYSCALL /* reserved for TUX */
254254
SYSCALL(sys_io_setup,sys_io_setup,sys_ni_syscall)
255255
SYSCALL(sys_io_destroy,sys_io_destroy,sys_ni_syscall)
@@ -268,6 +268,7 @@ SYSCALL(sys_timer_gettime,sys_timer_gettime,sys_ni_syscall)
268268
SYSCALL(sys_timer_getoverrun,sys_timer_getoverrun,sys_ni_syscall)
269269
SYSCALL(sys_timer_delete,sys_timer_delete,sys_ni_syscall)
270270
SYSCALL(sys_clock_settime,sys_clock_settime,sys_ni_syscall)
271-
SYSCALL(sys_clock_gettime,sys_clock_gettime,sys_ni_syscall)
271+
SYSCALL(sys_clock_gettime,sys_clock_gettime,sys_ni_syscall) /* 260 */
272272
SYSCALL(sys_clock_getres,sys_clock_getres,sys_ni_syscall)
273273
SYSCALL(sys_clock_nanosleep,sys_clock_nanosleep,sys_ni_syscall)
274+
NI_SYSCALL /* reserved for vserver */

‎arch/s390/kernel/time.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ void __init time_init(void)
266266
jiffies_timer_cc = init_timer_cc - jiffies_64 * CLK_TICKS_PER_JIFFY;
267267

268268
/* set xtime */
269-
xtime_cc = init_timer_cc;
269+
xtime_cc = init_timer_cc + CLK_TICKS_PER_JIFFY;
270270
set_time_cc = init_timer_cc - 0x8126d60e46000000LL +
271271
(0x3c26700LL*1000000*4096);
272272
tod_to_timeval(set_time_cc, &xtime);

‎include/asm-s390/unistd.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,7 @@
232232
#define __NR_futex 238
233233
#define __NR_sched_setaffinity 239
234234
#define __NR_sched_getaffinity 240
235-
/*
236-
* Number 241 is currently unused
237-
*/
235+
#define __NR_tgkill 241
238236
/*
239237
* Number 242 is reserved for tux
240238
*/
@@ -258,8 +256,11 @@
258256
#define __NR_clock_gettime (__NR_timer_create+6)
259257
#define __NR_clock_getres (__NR_timer_create+7)
260258
#define __NR_clock_nanosleep (__NR_timer_create+8)
259+
/*
260+
* Number 263 is reserved for vserver
261+
*/
261262

262-
#define NR_syscalls 263
263+
#define NR_syscalls 264
263264

264265
/*
265266
* There are some system calls that are not present on 64 bit, some

0 commit comments

Comments
 (0)