[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] Fix compiler warnings due to use of inline for mask_irq/unma
From: |
Samuel Thibault |
Subject: |
Re: [PATCH] Fix compiler warnings due to use of inline for mask_irq/unmask_irq |
Date: |
Sat, 17 Dec 2022 02:36:32 +0100 |
User-agent: |
NeoMutt/20170609 (1.8.3) |
Applied, thanks!
Flavio Cruz, le ven. 16 déc. 2022 17:47:36 -0500, a ecrit:
> ---
> i386/i386/apic.h | 14 ++++++++++++--
> i386/i386/pic.c | 4 ++--
> i386/i386/pic.h | 4 ++--
> i386/i386at/ioapic.c | 12 ------------
> 4 files changed, 16 insertions(+), 18 deletions(-)
>
> diff --git a/i386/i386/apic.h b/i386/i386/apic.h
> index add1b8cf..10c83c01 100644
> --- a/i386/i386/apic.h
> +++ b/i386/i386/apic.h
> @@ -158,8 +158,6 @@ void ioapic_configure(void);
> extern int timer_pin;
> extern void intnull(int unit);
> extern volatile ApicLocalUnit* lapic;
> -extern inline void mask_irq (unsigned int irq_nr);
> -extern inline void unmask_irq (unsigned int irq_nr);
>
> #endif
>
> @@ -207,5 +205,17 @@ extern inline void unmask_irq (unsigned int irq_nr);
> #define APIC_CLEAR_MASK_BIT(reg, bit) \
> ((reg)[(bit) >> 5].r &= ~(1 << ((bit) & 0x1f)))
>
> +#ifndef __ASSEMBLER__
> +
> +static inline void mask_irq (unsigned int irq_nr) {
> + ioapic_toggle(irq_nr, IOAPIC_MASK_DISABLED);
> +}
> +
> +static inline void unmask_irq (unsigned int irq_nr) {
> + ioapic_toggle(irq_nr, IOAPIC_MASK_ENABLED);
> +}
> +
> +#endif /* !__ASSEMBLER__ */
> +
> #endif /*_IMPS_APIC_*/
>
> diff --git a/i386/i386/pic.c b/i386/i386/pic.c
> index 62ed9ed1..4d51a535 100644
> --- a/i386/i386/pic.c
> +++ b/i386/i386/pic.c
> @@ -207,7 +207,7 @@ intnull(int unit_dev)
> /*
> * Mask a PIC IRQ.
> */
> -inline void
> +void
> mask_irq (unsigned int irq_nr)
> {
> int new_pic_mask = curr_pic_mask | 1 << irq_nr;
> @@ -229,7 +229,7 @@ mask_irq (unsigned int irq_nr)
> /*
> * Unmask a PIC IRQ.
> */
> -inline void
> +void
> unmask_irq (unsigned int irq_nr)
> {
> int mask;
> diff --git a/i386/i386/pic.h b/i386/i386/pic.h
> index 3ded9aba..aec0ef6b 100644
> --- a/i386/i386/pic.h
> +++ b/i386/i386/pic.h
> @@ -184,8 +184,8 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> extern void picinit (void);
> extern int curr_pic_mask;
> extern void intnull(int unit);
> -extern inline void mask_irq (unsigned int irq_nr);
> -extern inline void unmask_irq (unsigned int irq_nr);
> +extern void mask_irq (unsigned int irq_nr);
> +extern void unmask_irq (unsigned int irq_nr);
> #endif /* __ASSEMBLER__ */
>
> #endif /* _I386_PIC_H_ */
> diff --git a/i386/i386at/ioapic.c b/i386/i386at/ioapic.c
> index 18a9bec6..e5523488 100644
> --- a/i386/i386at/ioapic.c
> +++ b/i386/i386at/ioapic.c
> @@ -267,18 +267,6 @@ ioapic_irq_eoi(int pin)
> lapic_eoi ();
> }
>
> -void
> -unmask_irq(unsigned int irq)
> -{
> - ioapic_toggle(irq, IOAPIC_MASK_ENABLED);
> -}
> -
> -void
> -mask_irq(unsigned int irq)
> -{
> - ioapic_toggle(irq, IOAPIC_MASK_DISABLED);
> -}
> -
> static unsigned int
> override_irq(IrqOverrideData *override, union ioapic_route_entry_union
> *entry)
> {
> --
> 2.37.2
>
>
--
Samuel
---
Pour une évaluation indépendante, transparente et rigoureuse !
Je soutiens la Commission d'Évaluation de l'Inria.