2005-05-01 21:20:48

by Jeff Dike

[permalink] [raw]
Subject: [PATCH 20/22] UML - S390 preparation, sighandler interface abstraction

From: Bodo Stroesser <[email protected]>

s390 passes parameters in registers. So the only safe way to
find out the address of signal context, error-address and
error-type (trap_no), which are passed to signal handlers as
parameters, is to declare these parameters.
So I inserted an subarch-specific macro which holds the
declaration of parameters for signal handlers.

Signed-off-by: Bodo Stroesser <[email protected]>
Signed-off-by: Jeff Dike <[email protected]>

Index: linux-2.6.11/arch/um/include/sysdep-i386/signal.h
===================================================================
--- linux-2.6.11.orig/arch/um/include/sysdep-i386/signal.h 2005-04-29 13:44:52.000000000 -0400
+++ linux-2.6.11/arch/um/include/sysdep-i386/signal.h 2005-04-29 14:38:05.000000000 -0400
@@ -8,6 +8,8 @@

#include <signal.h>

+#define ARCH_SIGHDLR_PARAM int sig
+
#define ARCH_GET_SIGCONTEXT(sc, sig) \
do sc = (struct sigcontext *) (&sig + 1); while(0)

Index: linux-2.6.11/arch/um/include/sysdep-x86_64/signal.h
===================================================================
--- linux-2.6.11.orig/arch/um/include/sysdep-x86_64/signal.h 2005-04-29 13:44:52.000000000 -0400
+++ linux-2.6.11/arch/um/include/sysdep-x86_64/signal.h 2005-04-29 14:38:05.000000000 -0400
@@ -6,6 +6,8 @@
#ifndef __X86_64_SIGNAL_H_
#define __X86_64_SIGNAL_H_

+#define ARCH_SIGHDLR_PARAM int sig
+
#define ARCH_GET_SIGCONTEXT(sc, sig_addr) \
do { \
struct ucontext *__uc; \
Index: linux-2.6.11/arch/um/os-Linux/signal.c
===================================================================
--- linux-2.6.11.orig/arch/um/os-Linux/signal.c 2005-04-29 14:22:28.000000000 -0400
+++ linux-2.6.11/arch/um/os-Linux/signal.c 2005-04-29 14:38:05.000000000 -0400
@@ -8,7 +8,7 @@
#include "mode.h"
#include "sysdep/signal.h"

-void sig_handler(int sig)
+void sig_handler(ARCH_SIGHDLR_PARAM)
{
struct sigcontext *sc;

@@ -19,7 +19,7 @@

extern int timer_irq_inited;

-void alarm_handler(int sig)
+void alarm_handler(ARCH_SIGHDLR_PARAM)
{
struct sigcontext *sc;