| ia32_trap.c (208453) | ia32_trap.c (208514) |
|---|---|
| 1/*- 2 * Copyright (c) 2004 Marcel Moolenaar 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 * --- 11 unchanged lines hidden (view full) --- 20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2004 Marcel Moolenaar 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 * --- 11 unchanged lines hidden (view full) --- 20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> |
| 28__FBSDID("$FreeBSD: head/sys/ia64/ia32/ia32_trap.c 208453 2010-05-23 18:32:02Z kib $"); | 28__FBSDID("$FreeBSD: head/sys/ia64/ia32/ia32_trap.c 208514 2010-05-24 17:24:14Z kib $"); |
| 29 30#include <sys/param.h> 31#include <sys/systm.h> 32#include <sys/ktr.h> 33#include <sys/sysproto.h> 34#include <sys/kernel.h> 35#include <sys/lock.h> 36#include <sys/mutex.h> --- 90 unchanged lines hidden (view full) --- 127 else 128 sa->callp = &p->p_sysent->sv_table[sa->code]; 129 sa->narg = sa->callp->sy_narg; 130 131 if (params != NULL && sa->narg != 0) 132 error = copyin(params, (caddr_t)args, sa->narg * sizeof(int)); 133 else 134 error = 0; | 29 30#include <sys/param.h> 31#include <sys/systm.h> 32#include <sys/ktr.h> 33#include <sys/sysproto.h> 34#include <sys/kernel.h> 35#include <sys/lock.h> 36#include <sys/mutex.h> --- 90 unchanged lines hidden (view full) --- 127 else 128 sa->callp = &p->p_sysent->sv_table[sa->code]; 129 sa->narg = sa->callp->sy_narg; 130 131 if (params != NULL && sa->narg != 0) 132 error = copyin(params, (caddr_t)args, sa->narg * sizeof(int)); 133 else 134 error = 0; |
| 135 sa->args = &sa->args32[0]; |
|
| 135 136 if (error == 0) { 137 for (i = 0; i < sa->narg; i++) | 136 137 if (error == 0) { 138 for (i = 0; i < sa->narg; i++) |
| 138 sa->args[i] = args[i]; | 139 sa->args32[i] = args[i]; |
| 139 td->td_retval[0] = 0; 140 td->td_retval[1] = tf->tf_scratch.gr10; /* edx */ 141 } 142 143 return (error); 144} 145 146static void --- 134 unchanged lines hidden --- | 140 td->td_retval[0] = 0; 141 td->td_retval[1] = tf->tf_scratch.gr10; /* edx */ 142 } 143 144 return (error); 145} 146 147static void --- 134 unchanged lines hidden --- |