7619 Promote gfx_private.h to sys/gfx_private.h

Reviewed by: Alexander Pyhalov <alp@rsu.ru>
Reviewed by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
Reviewed by: Marcel Telka <marcel@telka.sk>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Richard Lowe <richlowe@richlowe.net>

13 files changed, 12 insertions, 23 deletions

diff --git a/usr/src/pkg/manifests/system-header.mf b/usr/src/pkg/manifests/system-header.mf
index e1bf69f00c..236a7ee8f8 100644
--- a/usr/src/pkg/manifests/system-header.mf
+++ b/usr/src/pkg/manifests/system-header.mf
@@ -1073,6 +1073,7 @@ file path=usr/include/sys/ftrace.h
 file path=usr/include/sys/fx.h
 file path=usr/include/sys/fxpriocntl.h
 file path=usr/include/sys/gfs.h
+file path=usr/include/sys/gfx_private.h
 file path=usr/include/sys/gld.h
 file path=usr/include/sys/gldpriv.h
 file path=usr/include/sys/group.h
diff --git a/usr/src/uts/common/io/drm/drm_bufs.c b/usr/src/uts/common/io/drm/drm_bufs.c
index ec01d37dab..f51d85978f 100644
--- a/usr/src/uts/common/io/drm/drm_bufs.c
+++ b/usr/src/uts/common/io/drm/drm_bufs.c
@@ -39,7 +39,7 @@
  */
 
 #include "drmP.h"
-#include <gfx_private.h>
+#include <sys/gfx_private.h>
 #include "drm_io32.h"
 
 
diff --git a/usr/src/uts/common/io/drm/drm_gem.c b/usr/src/uts/common/io/drm/drm_gem.c
index 69c5fc1c46..7fa5c29779 100644
--- a/usr/src/uts/common/io/drm/drm_gem.c
+++ b/usr/src/uts/common/io/drm/drm_gem.c
@@ -41,7 +41,7 @@
 #include <sys/bitmap.h>
 #include <sys/ddi.h>
 #include <sys/sunddi.h>
-#include <gfx_private.h>
+#include <sys/gfx_private.h>
 #include "drmP.h"
 #include "drm.h"
 
diff --git a/usr/src/uts/common/io/drm/drm_scatter.c b/usr/src/uts/common/io/drm/drm_scatter.c
index b1d1076af2..4d1b54e862 100644
--- a/usr/src/uts/common/io/drm/drm_scatter.c
+++ b/usr/src/uts/common/io/drm/drm_scatter.c
@@ -37,10 +37,8 @@
  */
 /* END CSTYLED */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "drmP.h"
-#include <gfx_private.h>
+#include <sys/gfx_private.h>
 #include "drm_io32.h"
 
 #define	DEBUG_SCATTER 0
diff --git a/usr/src/uts/common/io/drm/drm_sunmod.h b/usr/src/uts/common/io/drm/drm_sunmod.h
index 32cd5c0927..30d126fc4b 100644
--- a/usr/src/uts/common/io/drm/drm_sunmod.h
+++ b/usr/src/uts/common/io/drm/drm_sunmod.h
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Common misc module interfaces of DRM under Solaris
  */
@@ -72,7 +70,7 @@ extern "C" {
 #include <sys/ddi_impldefs.h>
 #include <sys/sunldi.h>
 #include <sys/mkdev.h>
-#include <gfx_private.h>
+#include <sys/gfx_private.h>
 #include <sys/agpgart.h>
 #include <sys/agp/agpdefs.h>
 #include <sys/agp/agpmaster_io.h>
diff --git a/usr/src/uts/common/sys/Makefile b/usr/src/uts/common/sys/Makefile
index 4c308a7fe1..f1edc47f08 100644
--- a/usr/src/uts/common/sys/Makefile
+++ b/usr/src/uts/common/sys/Makefile
@@ -52,6 +52,7 @@ i386_HDRS=			\
 	fdc.h			\
 	fdmedia.h		\
 	firmload.h		\
+	gfx_private.h		\
 	mouse.h			\
 	ucode.h
 
diff --git a/usr/src/uts/i86pc/io/gfx_private/gfx_private.h b/usr/src/uts/common/sys/gfx_private.h
index 5c85d89320..cf48724926 100644
--- a/usr/src/uts/i86pc/io/gfx_private/gfx_private.h
+++ b/usr/src/uts/common/sys/gfx_private.h
@@ -26,8 +26,6 @@
 #ifndef	_GFX_PRIVATE_H
 #define	_GFX_PRIVATE_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/usr/src/uts/i86pc/io/gfx_private/gfx_private.c b/usr/src/uts/i86pc/io/gfx_private/gfx_private.c
index 72eb423ec0..9a7c0e41af 100644
--- a/usr/src/uts/i86pc/io/gfx_private/gfx_private.c
+++ b/usr/src/uts/i86pc/io/gfx_private/gfx_private.c
@@ -38,7 +38,7 @@
 #include <sys/modctl.h>
 #include <sys/errno.h>
 #include <sys/reboot.h>
-#include "gfx_private.h"
+#include <sys/gfx_private.h>
 
 static struct modlmisc modlmisc = {
 	&mod_miscops, "gfx private interfaces"
diff --git a/usr/src/uts/i86pc/io/gfx_private/gfxp_devmap.c b/usr/src/uts/i86pc/io/gfx_private/gfxp_devmap.c
index 495b17377f..2a91253fb1 100644
--- a/usr/src/uts/i86pc/io/gfx_private/gfxp_devmap.c
+++ b/usr/src/uts/i86pc/io/gfx_private/gfxp_devmap.c
@@ -47,7 +47,7 @@
 #include <sys/pci.h>
 #include <sys/vmsystm.h>
 #include <sys/int_fmtio.h>
-#include "gfx_private.h"
+#include <sys/gfx_private.h>
 
 #ifdef __xpv
 #include <sys/hypervisor.h>
diff --git a/usr/src/uts/i86pc/io/gfx_private/gfxp_pci.c b/usr/src/uts/i86pc/io/gfx_private/gfxp_pci.c
index 51ba47834d..9694e25ead 100644
--- a/usr/src/uts/i86pc/io/gfx_private/gfxp_pci.c
+++ b/usr/src/uts/i86pc/io/gfx_private/gfxp_pci.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/debug.h>
 #include <sys/types.h>
 #include <sys/param.h>
@@ -68,7 +66,7 @@
 #include <sys/kstat.h>
 #include <sys/callb.h>
 #include <sys/pci_cfgspace.h>
-#include "gfx_private.h"
+#include <sys/gfx_private.h>
 
 typedef struct gfxp_pci_bsf {
 	uint16_t	vendor;
diff --git a/usr/src/uts/i86pc/io/gfx_private/gfxp_segmap.c b/usr/src/uts/i86pc/io/gfx_private/gfxp_segmap.c
index 093a15513b..1c4c849b51 100644
--- a/usr/src/uts/i86pc/io/gfx_private/gfxp_segmap.c
+++ b/usr/src/uts/i86pc/io/gfx_private/gfxp_segmap.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/debug.h>
 #include <sys/types.h>
 #include <sys/param.h>
@@ -47,7 +45,7 @@
 #include <sys/fs/snode.h>
 #include <sys/pci.h>
 #include <sys/vmsystm.h>
-#include "gfx_private.h"
+#include <sys/gfx_private.h>
 
 /*
  * clone of ddi_segmap_setup(). Respects the requested cache
diff --git a/usr/src/uts/i86pc/io/gfx_private/gfxp_vgatext.c b/usr/src/uts/i86pc/io/gfx_private/gfxp_vgatext.c
index c1aeda647a..9b7badd5f2 100644
--- a/usr/src/uts/i86pc/io/gfx_private/gfxp_vgatext.c
+++ b/usr/src/uts/i86pc/io/gfx_private/gfxp_vgatext.c
@@ -46,8 +46,7 @@
 #include <sys/pci.h>
 #include <sys/kd.h>
 #include <sys/ddi_impldefs.h>
-
-#include "gfx_private.h"
+#include <sys/gfx_private.h>
 
 #define	MYNAME	"gfxp_vgatext"
 
diff --git a/usr/src/uts/i86pc/io/gfx_private/gfxp_vm.c b/usr/src/uts/i86pc/io/gfx_private/gfxp_vm.c
index ca6a36cb5d..247e5cf555 100644
--- a/usr/src/uts/i86pc/io/gfx_private/gfxp_vm.c
+++ b/usr/src/uts/i86pc/io/gfx_private/gfxp_vm.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/debug.h>
 #include <sys/types.h>
 #include <sys/param.h>
@@ -72,7 +70,7 @@
 #include <sys/callb.h>
 #include <sys/promif.h>
 #include <sys/atomic.h>
-#include "gfx_private.h"
+#include <sys/gfx_private.h>
 
 #ifdef __xpv
 #include <sys/hypervisor.h>