Mon Aug 27 06:07:32 2018 UTC ()
match linux side loading

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>


(riastradh)
diff -r1.5 -r1.6 src/sys/external/bsd/drm2/include/linux/sched.h
cvs diff -r1.5 -r1.6 src/sys/external/bsd/drm2/include/linux/sched.h (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/include/linux/sched.h 2014/11/08 19:27:40 1.5
+++ src/sys/external/bsd/drm2/include/linux/sched.h 2018/08/27 06:07:32 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: sched.h,v 1.5 2014/11/08 19:27:40 nonaka Exp $ */ 1/* $NetBSD: sched.h,v 1.6 2018/08/27 06:07:32 riastradh Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2013 The NetBSD Foundation, Inc. 4 * Copyright (c) 2013 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Taylor R. Campbell. 8 * by Taylor R. Campbell.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -26,26 +26,29 @@ @@ -26,26 +26,29 @@
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#ifndef _LINUX_SCHED_H_ 32#ifndef _LINUX_SCHED_H_
33#define _LINUX_SCHED_H_ 33#define _LINUX_SCHED_H_
34 34
35#include <sys/param.h> 35#include <sys/param.h>
36#include <sys/kernel.h> 36#include <sys/kernel.h>
37#include <sys/proc.h> 37#include <sys/proc.h>
38 38
 39#include <asm/param.h>
 40#include <linux/errno.h>
 41
39#define TASK_COMM_LEN MAXCOMLEN 42#define TASK_COMM_LEN MAXCOMLEN
40 43
41#define current curproc 44#define current curproc
42 45
43static inline pid_t 46static inline pid_t
44task_pid_nr(struct proc *p) 47task_pid_nr(struct proc *p)
45{ 48{
46 return p->p_pid; 49 return p->p_pid;
47} 50}
48 51
49static inline long 52static inline long
50schedule_timeout_uninterruptible(long timeout) 53schedule_timeout_uninterruptible(long timeout)
51{ 54{