Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move linux_work.c and workqueue.h from sys/external/bsd/drm2 to

Browse Source 
sys/external/common so that they can be used by others.

LGTM from riastradh@

These should really live outside sys/external, but that can be decided
later
This commit is contained in:
skrll 2016-02-24 22:04:15 +00:00
parent f247f26769
commit 62976e3600
6 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/conf/files
View File

@ -1,4 +1,4 @@
# $NetBSD: files,v 1.1152 2015/12/09 18:25:32 maxv Exp $
# $NetBSD: files,v 1.1153 2016/02/24 22:04:15 skrll Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20150846
@ -1146,6 +1146,9 @@ define drm {}
include "external/bsd/drm/conf/files.drm"
include "dev/drm/files.drm"
# Linux API support
include "external/bsd/common/conf/files.linux"
# DRM/KMS - Newer direct rendering manager with kernel mode-switching
include "external/bsd/drm2/drm/files.drmkms"

2
sys/external/bsd/drm2/include/linux/workqueue.h → sys/external/bsd/common/include/linux/workqueue.h vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: workqueue.h,v 1.4 2014/07/16 20:59:58 riastradh Exp $ */
/* $NetBSD: workqueue.h,v 1.1 2016/02/24 22:04:15 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.

4
sys/external/bsd/drm2/linux/linux_work.c → sys/external/bsd/common/linux/linux_work.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_work.c,v 1.12 2015/11/15 22:56:24 jakllsch Exp $ */
/* $NetBSD: linux_work.c,v 1.1 2016/02/24 22:04:15 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: linux_work.c,v 1.12 2015/11/15 22:56:24 jakllsch Exp $");
__KERNEL_RCSID(0, "$NetBSD: linux_work.c,v 1.1 2016/02/24 22:04:15 skrll Exp $");
#include <sys/types.h>
#include <sys/param.h>

4
sys/external/bsd/drm2/drm/files.drmkms vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: files.drmkms,v 1.12 2015/08/20 21:41:12 skrll Exp $
# $NetBSD: files.drmkms,v 1.13 2016/02/24 22:04:15 skrll Exp $
include "external/bsd/drm2/linux/files.drmkms_linux"
@ -8,7 +8,7 @@ include "external/bsd/drm2/linux/files.drmkms_linux"
# ARM SoC graphics drivers.
define drmkms_i2c: drmkms_linux
define drmkms: drmkms_linux, drmkms_i2c
define drmkms: drmkms_linux, drmkms_i2c, linux
defflag opt_drmkms.h DRMKMS_DEBUG
makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/include"

3
sys/external/bsd/drm2/linux/files.drmkms_linux vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: files.drmkms_linux,v 1.8 2015/01/08 23:35:47 riastradh Exp $
# $NetBSD: files.drmkms_linux,v 1.9 2016/02/24 22:04:15 skrll Exp $
define drmkms_linux: i2cexec, i2c_bitbang
@ -11,6 +11,5 @@ file external/bsd/drm2/linux/linux_i2c.c drmkms_linux
file external/bsd/drm2/linux/linux_idr.c drmkms_linux
file external/bsd/drm2/linux/linux_list_sort.c drmkms_linux
file external/bsd/drm2/linux/linux_module.c drmkms_linux
file external/bsd/drm2/linux/linux_work.c drmkms_linux
file external/bsd/drm2/linux/linux_writecomb.c drmkms_linux
file external/bsd/drm2/linux/linux_ww_mutex.c drmkms_linux

9
sys/modules/drmkms_linux/Makefile
View File

@ -1,8 +1,15 @@
# $NetBSD: Makefile,v 1.6 2015/01/08 23:35:47 riastradh Exp $
# $NetBSD: Makefile,v 1.7 2016/02/24 22:04:15 skrll Exp $
#
# At some point this needs to turn into linux.kmod and a proper home for it
# found. For now pickup the linux_work.c from the (increasingly poorly
# named) common area.
#
.include "../Makefile.inc"
.PATH: ${S}/external/bsd/drm2/linux
.PATH: ${S}/external/bsd/common/linux
CPPFLAGS+= -I${S}/external/bsd/common/include
CPPFLAGS+= -I${S}/external/bsd/drm2/include