Author: smh
Date: Sat Nov 22 14:59:50 2014
New Revision: 274852
URL: https://svnweb.freebsd.org/changeset/base/274852
Log:
Fix build with asr driver
This was broken by r274819 as asr is not in GENERIC because its not 64bit
safe.
MFC after: 1 month
X-MFC-With: r274819
Sponsored by: Multiplay
Modified:
head/sys/dev/asr/asr.c
Modified: head/sys/dev/asr/asr.c
==============================================================================
--- head/sys/dev/asr/asr.c Sat Nov 22 14:53:50 2014 (r274851)
+++ head/sys/dev/asr/asr.c Sat Nov 22 14:59:50 2014 (r274852)
@@ -384,26 +384,6 @@ typedef struct Asr_softc {
static STAILQ_HEAD(, Asr_softc) Asr_softc_list =
STAILQ_HEAD_INITIALIZER(Asr_softc_list);
-
-static __inline void
-set_ccb_timeout_ch(union asr_ccb *ccb)
-{
- struct callout_handle ch;
-
- ch = timeout(asr_timeout, (caddr_t)ccb,
- (int)((u_int64_t)(ccb->ccb_h.timeout) * (u_int32_t)hz / 1000));
- ccb->ccb_h.sim_priv.entries[0].ptr = ch.callout;
-}
-
-static __inline struct callout_handle
-get_ccb_timeout_ch(union asr_ccb *ccb)
-{
- struct callout_handle ch;
-
- ch.callout = ccb->ccb_h.sim_priv.entries[0].ptr;
- return ch;
-}
-
/*
* Prototypes of the routines we have in this object.
*/
@@ -426,6 +406,25 @@ static void asr_action(struct cam_sim *s
static void asr_poll(struct cam_sim *sim);
static int ASR_queue(Asr_softc_t *sc, PI2O_MESSAGE_FRAME Message);
+static __inline void
+set_ccb_timeout_ch(union asr_ccb *ccb)
+{
+ struct callout_handle ch;
+
+ ch = timeout(asr_timeout, (caddr_t)ccb,
+ (int)((u_int64_t)(ccb->ccb_h.timeout) * (u_int32_t)hz / 1000));
+ ccb->ccb_h.sim_priv.entries[0].ptr = ch.callout;
+}
+
+static __inline struct callout_handle
+get_ccb_timeout_ch(union asr_ccb *ccb)
+{
+ struct callout_handle ch;
+
+ ch.callout = ccb->ccb_h.sim_priv.entries[0].ptr;
+ return ch;
+}
+
/*
* Here is the auto-probe structure used to nest our tests appropriately
* during the startup phase of the operating system.
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
