[PATCH] uml: merge trap_user.c and trap_kern.c
authorGennady Sharapov <Gennady.V.Sharapov@intel.com>
Sun, 8 Jan 2006 09:01:32 +0000 (01:01 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 9 Jan 2006 04:13:39 +0000 (20:13 -0800)
commitc66fdd5e324392584c6f11de65cfe24b0e2d9303
treef05cb784406c0a0cb24d291e515dfcaa3e4b6464
parentea2ba7dc3dd3f85034e6da6abacc813d723a2ad5
[PATCH] uml: merge trap_user.c and trap_kern.c

The serial UML OS-abstraction layer patch (um/kernel dir).

This joins trap_user.c and trap_kernel.c files.

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>
arch/um/kernel/Makefile
arch/um/kernel/trap_kern.c
arch/um/kernel/trap_user.c [deleted file]
arch/um/os-Linux/trap.c