diff options
author | Gennady Sharapov <Gennady.V.Sharapov@intel.com> | 2006-01-08 04:01:31 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-08 23:13:39 -0500 |
commit | ea2ba7dc3dd3f85034e6da6abacc813d723a2ad5 (patch) | |
tree | 56f3d2a22d3ba3d91042d9a536b659b9c967dc03 /arch/um/kernel/trap_kern.c | |
parent | 0805d89c151b4800eade4c2f50d39c5253d7d054 (diff) |
[PATCH] uml: move libc-dependent code from trap_user.c
The serial UML OS-abstraction layer patch (um/kernel dir).
This moves all systemcalls from trap_user.c file under os-Linux dir
Signed-off-by: Gennady Sharapov <Gennady.V.Sharapov@intel.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/kernel/trap_kern.c')
-rw-r--r-- | arch/um/kernel/trap_kern.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/um/kernel/trap_kern.c b/arch/um/kernel/trap_kern.c index 0d4c10a7360..b79f805bdc0 100644 --- a/arch/um/kernel/trap_kern.c +++ b/arch/um/kernel/trap_kern.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com) | 2 | * Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com) |
3 | * Licensed under the GPL | 3 | * Licensed under the GPL |
4 | */ | 4 | */ |
@@ -29,6 +29,7 @@ | |||
29 | #ifdef CONFIG_MODE_SKAS | 29 | #ifdef CONFIG_MODE_SKAS |
30 | #include "skas.h" | 30 | #include "skas.h" |
31 | #endif | 31 | #endif |
32 | #include "os.h" | ||
32 | 33 | ||
33 | /* Note this is constrained to return 0, -EFAULT, -EACCESS, -ENOMEM by segv(). */ | 34 | /* Note this is constrained to return 0, -EFAULT, -EACCESS, -ENOMEM by segv(). */ |
34 | int handle_page_fault(unsigned long address, unsigned long ip, | 35 | int handle_page_fault(unsigned long address, unsigned long ip, |
@@ -125,6 +126,14 @@ out_of_memory: | |||
125 | goto out; | 126 | goto out; |
126 | } | 127 | } |
127 | 128 | ||
129 | struct kern_handlers handlinfo_kern = { | ||
130 | .relay_signal = relay_signal, | ||
131 | .winch = winch, | ||
132 | .bus_handler = relay_signal, | ||
133 | .page_fault = segv_handler, | ||
134 | .sigio_handler = sigio_handler, | ||
135 | .timer_handler = timer_handler | ||
136 | }; | ||
128 | /* | 137 | /* |
129 | * We give a *copy* of the faultinfo in the regs to segv. | 138 | * We give a *copy* of the faultinfo in the regs to segv. |
130 | * This must be done, since nesting SEGVs could overwrite | 139 | * This must be done, since nesting SEGVs could overwrite |