| linux_signal.c (133850) | linux_signal.c (140214) |
|---|---|
| 1/*- 2 * Copyright (c) 1994-1995 S�ren Schmidt 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 13 unchanged lines hidden (view full) --- 22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 */ 28 29#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1994-1995 S�ren Schmidt 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 13 unchanged lines hidden (view full) --- 22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 */ 28 29#include <sys/cdefs.h> |
| 30__FBSDID("$FreeBSD: head/sys/compat/linux/linux_signal.c 133850 2004-08-16 12:15:07Z obrien $"); | 30__FBSDID("$FreeBSD: head/sys/compat/linux/linux_signal.c 140214 2005-01-14 04:44:56Z obrien $"); |
| 31 32#include <sys/param.h> 33#include <sys/systm.h> 34#include <sys/lock.h> 35#include <sys/mutex.h> 36#include <sys/proc.h> 37#include <sys/signalvar.h> 38#include <sys/syscallsubr.h> 39#include <sys/sysproto.h> 40 41#include "opt_compat.h" 42 | 31 32#include <sys/param.h> 33#include <sys/systm.h> 34#include <sys/lock.h> 35#include <sys/mutex.h> 36#include <sys/proc.h> 37#include <sys/signalvar.h> 38#include <sys/syscallsubr.h> 39#include <sys/sysproto.h> 40 41#include "opt_compat.h" 42 |
| 43#if !COMPAT_LINUX32 44#include <machine/../linux/linux.h> 45#include <machine/../linux/linux_proto.h> 46#else | 43#ifdef COMPAT_LINUX32 |
| 47#include <machine/../linux32/linux.h> 48#include <machine/../linux32/linux32_proto.h> | 44#include <machine/../linux32/linux.h> 45#include <machine/../linux32/linux32_proto.h> |
| 46#else 47#include <machine/../linux/linux.h> 48#include <machine/../linux/linux_proto.h> |
|
| 49#endif 50#include <compat/linux/linux_signal.h> 51#include <compat/linux/linux_util.h> 52 53void 54linux_to_bsd_sigset(l_sigset_t *lss, sigset_t *bss) 55{ 56 int b, l; --- 58 unchanged lines hidden (view full) --- 115 bsa->sa_flags |= SA_NODEFER; 116} 117 118static void 119bsd_to_linux_sigaction(struct sigaction *bsa, l_sigaction_t *lsa) 120{ 121 122 bsd_to_linux_sigset(&bsa->sa_mask, &lsa->lsa_mask); | 49#endif 50#include <compat/linux/linux_signal.h> 51#include <compat/linux/linux_util.h> 52 53void 54linux_to_bsd_sigset(l_sigset_t *lss, sigset_t *bss) 55{ 56 int b, l; --- 58 unchanged lines hidden (view full) --- 115 bsa->sa_flags |= SA_NODEFER; 116} 117 118static void 119bsd_to_linux_sigaction(struct sigaction *bsa, l_sigaction_t *lsa) 120{ 121 122 bsd_to_linux_sigset(&bsa->sa_mask, &lsa->lsa_mask); |
| 123#if COMPAT_LINUX32 | 123#ifdef COMPAT_LINUX32 |
| 124 lsa->lsa_handler = (uintptr_t)bsa->sa_handler; 125#else 126 lsa->lsa_handler = bsa->sa_handler; 127#endif 128 lsa->lsa_restorer = 0; /* unsupported */ 129 lsa->lsa_flags = 0; 130 if (bsa->sa_flags & SA_NOCLDSTOP) 131 lsa->lsa_flags |= LINUX_SA_NOCLDSTOP; --- 308 unchanged lines hidden --- | 124 lsa->lsa_handler = (uintptr_t)bsa->sa_handler; 125#else 126 lsa->lsa_handler = bsa->sa_handler; 127#endif 128 lsa->lsa_restorer = 0; /* unsupported */ 129 lsa->lsa_flags = 0; 130 if (bsa->sa_flags & SA_NOCLDSTOP) 131 lsa->lsa_flags |= LINUX_SA_NOCLDSTOP; --- 308 unchanged lines hidden --- |