Deleted Added
full compact
procfs_ioctl.c (169168) procfs_ioctl.c (170307)
1/*-
2 * Copyright (c) 2001 Dag-Erling Co�dan Sm�rgrav
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

--- 11 unchanged lines hidden (view full) ---

20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
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 *
1/*-
2 * Copyright (c) 2001 Dag-Erling Co�dan Sm�rgrav
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

--- 11 unchanged lines hidden (view full) ---

20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
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 * $FreeBSD: head/sys/fs/procfs/procfs_ioctl.c 169168 2007-05-01 12:59:20Z des $
28 * $FreeBSD: head/sys/fs/procfs/procfs_ioctl.c 170307 2007-06-05 00:00:57Z jeff $
29 */
30
31#include "opt_compat.h"
32
33#include <sys/param.h>
34#include <sys/lock.h>
35#include <sys/mutex.h>
36#include <sys/pioctl.h>

--- 143 unchanged lines hidden (view full) ---

180 error = EINVAL;
181 break;
182 }
183#if 0
184 p->p_step = 0;
185 if (P_SHOULDSTOP(p)) {
186 p->p_xstat = sig;
187 p->p_flag &= ~(P_STOPPED_TRACE|P_STOPPED_SIG);
29 */
30
31#include "opt_compat.h"
32
33#include <sys/param.h>
34#include <sys/lock.h>
35#include <sys/mutex.h>
36#include <sys/pioctl.h>

--- 143 unchanged lines hidden (view full) ---

180 error = EINVAL;
181 break;
182 }
183#if 0
184 p->p_step = 0;
185 if (P_SHOULDSTOP(p)) {
186 p->p_xstat = sig;
187 p->p_flag &= ~(P_STOPPED_TRACE|P_STOPPED_SIG);
188 mtx_lock_spin(&sched_lock);
188 PROC_SLOCK(p);
189 thread_unsuspend(p);
189 thread_unsuspend(p);
190 mtx_unlock_spin(&sched_lock);
190 PROC_SUNLOCK(p);
191 } else if (sig)
192 psignal(p, sig);
193#else
194 if (sig)
195 psignal(p, sig);
196 p->p_step = 0;
197 wakeup(&p->p_step);
198#endif

--- 23 unchanged lines hidden ---
191 } else if (sig)
192 psignal(p, sig);
193#else
194 if (sig)
195 psignal(p, sig);
196 p->p_step = 0;
197 wakeup(&p->p_step);
198#endif

--- 23 unchanged lines hidden ---