svn commit: r299108 - head/sys/sys

[Garrett Cooper]

Author: ngie
Date: Thu May  5 02:51:31 2016
New Revision: 299108
URL: https://svnweb.freebsd.org/changeset/base/299108

Log:
  Revert r299096
  
  The change broke buildworld when building lib/libkvm
  
  This change likely needs to be run through a ports -exp run as a sanity
  check, as it might break downstream consumers.
  
  Pointyhat to: adrian
  Reported by: kargl (confirmed on $work workstation)
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/sys/pcpu.h
  head/sys/sys/rman.h

Modified: head/sys/sys/pcpu.h
==============================================================================
--- head/sys/sys/pcpu.h	Thu May  5 01:35:42 2016	(r299107)
+++ head/sys/sys/pcpu.h	Thu May  5 02:51:31 2016	(r299108)
@@ -160,7 +160,7 @@ struct pcpu {
 	struct lock_list_entry *pc_spinlocks;
 	struct vmmeter	pc_cnt;			/* VM stats counters */
 	long		pc_cp_time[CPUSTATES];	/* statclock ticks */
-	device_t	pc_device;
+	struct device	*pc_device;
 	void		*pc_netisr;		/* netisr SWI cookie */
 	int		pc_unused1;		/* unused field */
 	int		pc_domain;		/* Memory domain. */

Modified: head/sys/sys/rman.h
==============================================================================
--- head/sys/sys/rman.h	Thu May  5 01:35:42 2016	(r299107)
+++ head/sys/sys/rman.h	Thu May  5 02:51:31 2016	(r299108)
@@ -126,7 +126,7 @@ int	rman_first_free_region(struct rman *
 bus_space_handle_t rman_get_bushandle(struct resource *);
 bus_space_tag_t rman_get_bustag(struct resource *);
 rman_res_t	rman_get_end(struct resource *);
-device_t rman_get_device(struct resource *);
+struct device *rman_get_device(struct resource *);
 u_int	rman_get_flags(struct resource *);
 int	rman_get_rid(struct resource *);
 rman_res_t	rman_get_size(struct resource *);
@@ -143,13 +143,13 @@ int	rman_is_region_manager(struct resour
 int	rman_release_resource(struct resource *r);
 struct resource *rman_reserve_resource(struct rman *rm, rman_res_t start,
 					rman_res_t end, rman_res_t count,
-					u_int flags, device_t dev);
+					u_int flags, struct device *dev);
 struct resource *rman_reserve_resource_bound(struct rman *rm, rman_res_t start,
 					rman_res_t end, rman_res_t count, rman_res_t bound,
-					u_int flags, device_t dev);
+					u_int flags, struct device *dev);
 void	rman_set_bushandle(struct resource *_r, bus_space_handle_t _h);
 void	rman_set_bustag(struct resource *_r, bus_space_tag_t _t);
-void	rman_set_device(struct resource *_r, device_t _dev);
+void	rman_set_device(struct resource *_r, struct device *_dev);
 void	rman_set_end(struct resource *_r, rman_res_t _end);
 void	rman_set_rid(struct resource *_r, int _rid);
 void	rman_set_start(struct resource *_r, rman_res_t _start);