patch-2.3.49 linux/arch/arm/kernel/arthur.c

Next file: linux/arch/arm/kernel/entry-armo.S
Previous file: linux/arch/arm/config.in
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.48/linux/arch/arm/kernel/arthur.c linux/arch/arm/kernel/arthur.c
@@ -1,6 +1,6 @@
 /*
  * Arthur personality
- * Copyright (C) 1998 Philip Blundell
+ * Copyright (C) 1998-1999 Philip Blundell
  */
 
 #include <linux/personality.h>
@@ -8,35 +8,36 @@
 #include <linux/stddef.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
+#include <linux/init.h>
 
 #include <asm/ptrace.h>
 
-/* RISC OS doesn't have many signals, and a lot of those that it does
+/* Arthur doesn't have many signals, and a lot of those that it does
    have don't map easily to any Linux equivalent.  Never mind.  */
 
-#define RISCOS_SIGABRT		1
-#define RISCOS_SIGFPE		2
-#define RISCOS_SIGILL		3
-#define RISCOS_SIGINT		4
-#define RISCOS_SIGSEGV		5
-#define RISCOS_SIGTERM		6
-#define RISCOS_SIGSTAK		7
-#define RISCOS_SIGUSR1		8
-#define RISCOS_SIGUSR2		9
-#define RISCOS_SIGOSERROR	10
+#define ARTHUR_SIGABRT		1
+#define ARTHUR_SIGFPE		2
+#define ARTHUR_SIGILL		3
+#define ARTHUR_SIGINT		4
+#define ARTHUR_SIGSEGV		5
+#define ARTHUR_SIGTERM		6
+#define ARTHUR_SIGSTAK		7
+#define ARTHUR_SIGUSR1		8
+#define ARTHUR_SIGUSR2		9
+#define ARTHUR_SIGOSERROR	10
 
-static unsigned long riscos_to_linux_signals[32] = {
+static unsigned long arthur_to_linux_signals[32] = {
 	0,	1,	2,	3,	4,	5,	6,	7,
 	8,	9,	10,	11,	12,	13,	14,	15,
 	16,	17,	18,	19,	20,	21,	22,	23,
 	24,	25,	26,	27,	28,	29,	30,	31
 };
 
-static unsigned long linux_to_riscos_signals[32] = {
-	0,		-1,		RISCOS_SIGINT,	-1,
-       	RISCOS_SIGILL,	5,		RISCOS_SIGABRT,	7,
-	RISCOS_SIGFPE,	9,		RISCOS_SIGUSR1,	RISCOS_SIGSEGV,	
-	RISCOS_SIGUSR2,	13,		14,		RISCOS_SIGTERM,
+static unsigned long linux_to_arthur_signals[32] = {
+	0,		-1,		ARTHUR_SIGINT,	-1,
+       	ARTHUR_SIGILL,	5,		ARTHUR_SIGABRT,	7,
+	ARTHUR_SIGFPE,	9,		ARTHUR_SIGUSR1,	ARTHUR_SIGSEGV,	
+	ARTHUR_SIGUSR2,	13,		14,		ARTHUR_SIGTERM,
 	16,		17,		18,		19,
 	20,		21,		22,		23,
 	24,		25,		26,		27,
@@ -52,12 +53,12 @@
 	send_sig_info(SIGSWI, &info, current);
 }
 
-static struct exec_domain riscos_exec_domain = {
+static struct exec_domain arthur_exec_domain = {
 	"Arthur",	/* name */
 	(lcall7_func)arthur_lcall7,
 	PER_RISCOS, PER_RISCOS,
-	riscos_to_linux_signals,
-	linux_to_riscos_signals,
+	arthur_to_linux_signals,
+	linux_to_arthur_signals,
 #ifdef MODULE
 	&__this_module,	/* No usage counter. */
 #else
@@ -71,18 +72,15 @@
  * processes are using it.
  */
 
-#ifdef MODULE
-int init_module(void)
-#else
-int initialise_arthur(void)
-#endif
+int __init arthur_init(void)
 {
-	return register_exec_domain(&riscos_exec_domain);
+	return register_exec_domain(&arthur_exec_domain);
 }
 
-#ifdef MODULE
-void cleanup_module(void)
+void __exit arthur_exit(void)
 {
-	unregister_exec_domain(&riscos_exec_domain);
+	unregister_exec_domain(&arthur_exec_domain);
 }
-#endif
+
+module_init(arthur_init);
+module_exit(arthur_exit);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)