Message ID | 20210901094153.227671-8-clg@kaod.org |
---|---|
State | New |
Headers | show |
Series | ppc: cleanups | expand |
On Wed, Sep 01, 2021 at 11:41:52AM +0200, Cédric Le Goater wrote: > Signed-off-by: Cédric Le Goater <clg@kaod.org> Applied to ppc-for-6.2 > --- > include/hw/ppc/xive.h | 5 +++++ > hw/intc/xive.c | 5 ----- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h > index 29b130eaea59..252c58a1d691 100644 > --- a/include/hw/ppc/xive.h > +++ b/include/hw/ppc/xive.h > @@ -335,6 +335,11 @@ struct XiveTCTX { > XivePresenter *xptr; > }; > > +static inline uint32_t xive_tctx_word2(uint8_t *ring) > +{ > + return *((uint32_t *) &ring[TM_WORD2]); > +} > + > /* > * XIVE Router > */ > diff --git a/hw/intc/xive.c b/hw/intc/xive.c > index b0c4f76b1d4b..6c82326ec768 100644 > --- a/hw/intc/xive.c > +++ b/hw/intc/xive.c > @@ -141,11 +141,6 @@ void xive_tctx_ipb_update(XiveTCTX *tctx, uint8_t ring, uint8_t ipb) > xive_tctx_notify(tctx, ring); > } > > -static inline uint32_t xive_tctx_word2(uint8_t *ring) > -{ > - return *((uint32_t *) &ring[TM_WORD2]); > -} > - > /* > * XIVE Thread Interrupt Management Area (TIMA) > */
diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h index 29b130eaea59..252c58a1d691 100644 --- a/include/hw/ppc/xive.h +++ b/include/hw/ppc/xive.h @@ -335,6 +335,11 @@ struct XiveTCTX { XivePresenter *xptr; }; +static inline uint32_t xive_tctx_word2(uint8_t *ring) +{ + return *((uint32_t *) &ring[TM_WORD2]); +} + /* * XIVE Router */ diff --git a/hw/intc/xive.c b/hw/intc/xive.c index b0c4f76b1d4b..6c82326ec768 100644 --- a/hw/intc/xive.c +++ b/hw/intc/xive.c @@ -141,11 +141,6 @@ void xive_tctx_ipb_update(XiveTCTX *tctx, uint8_t ring, uint8_t ipb) xive_tctx_notify(tctx, ring); } -static inline uint32_t xive_tctx_word2(uint8_t *ring) -{ - return *((uint32_t *) &ring[TM_WORD2]); -} - /* * XIVE Thread Interrupt Management Area (TIMA) */
Signed-off-by: Cédric Le Goater <clg@kaod.org> --- include/hw/ppc/xive.h | 5 +++++ hw/intc/xive.c | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-)