diff options
| author | ngie <ngie@FreeBSD.org> | 2016-05-05 02:51:31 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2016-05-05 02:51:31 +0000 |
| commit | 4c9675481b04358fd0b9163eff87e437f78c94fb (patch) | |
| tree | b9e392bf94fbfd16eed5c838f1a98516a42ba102 /sys/sys | |
| parent | 3b02df6fd3bb6f1f89429eb1a6c6a21cb14a595d (diff) | |
| download | FreeBSD-src-4c9675481b04358fd0b9163eff87e437f78c94fb.zip FreeBSD-src-4c9675481b04358fd0b9163eff87e437f78c94fb.tar.gz | |
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
Diffstat (limited to 'sys/sys')
| -rw-r--r-- | sys/sys/pcpu.h | 2 | ||||
| -rw-r--r-- | sys/sys/rman.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/sys/pcpu.h b/sys/sys/pcpu.h index 8e6a71a..d6d1b3d 100644 --- a/sys/sys/pcpu.h +++ b/sys/sys/pcpu.h @@ -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. */ diff --git a/sys/sys/rman.h b/sys/sys/rman.h index d702d25..2d58f4a 100644 --- a/sys/sys/rman.h +++ b/sys/sys/rman.h @@ -126,7 +126,7 @@ int rman_first_free_region(struct rman *rm, rman_res_t *start, rman_res_t *end); 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 resource *r, struct rman *rm); 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); |
