[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.

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 8d78a7897c541c30a47a4bbc8cf0f2603590ecc5..81250a2008ff2cb0880260ba90bf9c979e822146 100644 (file)
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -48,20 +48,18 @@ libs-y              += arch/$(ARCH)/lib/
 drivers-y      += drivers/s390/
 drivers-$(CONFIG_MATHEMU) += arch/$(ARCH)/math-emu/
 
+boot           := arch/$(ARCH)/boot
 
-makeboot =$(Q)$(MAKE) -f scripts/Makefile.build obj=arch/$(ARCH)/boot $(1)
-
-all: image listing
-
-listing image: vmlinux
-       $(call makeboot,arch/$(ARCH)/boot/$@)
+all: image
 
 install: vmlinux
-       $(call makeboot, $@)
+       $(Q)$(MAKE) $(build)=$(boot) $@
 
-archclean:
-       $(Q)$(MAKE) -f scripts/Makefile.clean obj=arch/$(ARCH)/boot
+image: vmlinux
+       $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
+archclean:
+       $(Q)$(MAKE) $(clean)=$(boot)
 
 prepare: include/asm-$(ARCH)/offsets.h
 

diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile
index 02746840715c95f139cc3efc56aa791e30080b8d..a67fd8afc99ad8abdc03403f632799dba646c33f 100644 (file)
--- a/arch/s390/boot/Makefile
+++ b/arch/s390/boot/Makefile
@@ -6,7 +6,7 @@ COMPILE_VERSION := __linux_compile_version_id__`hostname |  \
                        tr -c '[0-9A-Za-z]' '_'`__`date | \
                        tr -c '[0-9A-Za-z]' '_'`_t
 
-EXTRA_CFLAGS  := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I .
+EXTRA_CFLAGS  := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I.
 
 targets := image
 

diff --git a/arch/s390/kernel/s390_ksyms.c b/arch/s390/kernel/s390_ksyms.c
index a02b42883de49310ab8b976ca8706dfca0a80f09..39f83cbbebd2652e70a4c087cdba04fd69720b4d 100644 (file)
--- a/arch/s390/kernel/s390_ksyms.c
+++ b/arch/s390/kernel/s390_ksyms.c
@@ -10,6 +10,7 @@
 #include <linux/smp.h>
 #include <linux/interrupt.h>
 #include <asm/checksum.h>
+#include <asm/cpcmd.h>
 #include <asm/delay.h>
 #include <asm/pgalloc.h>
 #include <asm/setup.h>
@@ -72,3 +73,5 @@ EXPORT_SYMBOL(console_mode);
 EXPORT_SYMBOL(console_device);
 EXPORT_SYMBOL_NOVERS(do_call_softirq);
 EXPORT_SYMBOL(sys_wait4);
+EXPORT_SYMBOL(cpcmd);
+

diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S
index 287dba78004426f6716c8b72a3c7151b725019e3..9fe7afeaedf6a50c4edad4f72cbba9a38766dd42 100644 (file)
--- a/arch/s390/kernel/syscalls.S
+++ b/arch/s390/kernel/syscalls.S
@@ -249,7 +249,7 @@ SYSCALL(sys_tkill,sys_tkill,sys_tkill)
 SYSCALL(sys_futex,sys_futex,compat_sys_futex_wrapper)
 SYSCALL(sys_sched_setaffinity,sys_sched_setaffinity,sys32_sched_setaffinity_wrapper)
 SYSCALL(sys_sched_getaffinity,sys_sched_getaffinity,sys32_sched_getaffinity_wrapper)   /* 240 */
-NI_SYSCALL                                     
+SYSCALL(sys_tgkill,sys_tgkill,sys_tgkill)
 NI_SYSCALL                                                     /* reserved for TUX */
 SYSCALL(sys_io_setup,sys_io_setup,sys_ni_syscall)
 SYSCALL(sys_io_destroy,sys_io_destroy,sys_ni_syscall)
@@ -268,6 +268,7 @@ SYSCALL(sys_timer_gettime,sys_timer_gettime,sys_ni_syscall)
 SYSCALL(sys_timer_getoverrun,sys_timer_getoverrun,sys_ni_syscall)
 SYSCALL(sys_timer_delete,sys_timer_delete,sys_ni_syscall)
 SYSCALL(sys_clock_settime,sys_clock_settime,sys_ni_syscall)
-SYSCALL(sys_clock_gettime,sys_clock_gettime,sys_ni_syscall)
+SYSCALL(sys_clock_gettime,sys_clock_gettime,sys_ni_syscall)    /* 260 */
 SYSCALL(sys_clock_getres,sys_clock_getres,sys_ni_syscall)
 SYSCALL(sys_clock_nanosleep,sys_clock_nanosleep,sys_ni_syscall)
+NI_SYSCALL                                                     /* reserved for vserver */

diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index 2b48351814551744c85a9ef333e0e8947a486eda..16b41456093ebff19c69a9860bcf0b390eb33678 100644 (file)
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -266,7 +266,7 @@ void __init time_init(void)
        jiffies_timer_cc = init_timer_cc - jiffies_64 * CLK_TICKS_PER_JIFFY;
 
        /* set xtime */
-       xtime_cc = init_timer_cc;
+       xtime_cc = init_timer_cc + CLK_TICKS_PER_JIFFY;
        set_time_cc = init_timer_cc - 0x8126d60e46000000LL +
                (0x3c26700LL*1000000*4096);
         tod_to_timeval(set_time_cc, &xtime);

diff --git a/include/asm-s390/unistd.h b/include/asm-s390/unistd.h
index 11b693ebb31b916efcc8bc1a4f21ba09e4ce5924..f71b3b352ce8c80b8f256beb7d228e34c3c441ab 100644 (file)
--- a/include/asm-s390/unistd.h
+++ b/include/asm-s390/unistd.h
@@ -232,9 +232,7 @@
 #define __NR_futex             238
 #define __NR_sched_setaffinity 239
 #define __NR_sched_getaffinity 240
-/*
- * Number 241 is currently unused
- */
+#define __NR_tgkill            241
 /*
  * Number 242 is reserved for tux
  */
@@ -258,8 +256,11 @@
 #define __NR_clock_gettime     (__NR_timer_create+6)
 #define __NR_clock_getres      (__NR_timer_create+7)
 #define __NR_clock_nanosleep   (__NR_timer_create+8)
+/*
+ * Number 263 is reserved for vserver
+ */
 
-#define NR_syscalls 263
+#define NR_syscalls 264
 
 /* 
  * There are some system calls that are not present on 64 bit, some