[Intel-gfx] [PATCH 2/2] Revert "rtc/cmos: Protect rtc_lock from interrupts"

[Rodrigo Vivi]

On Mon, Apr 13, 2020 at 05:08:44PM -0700, José Roberto de Souza wrote:
> Fix build.

sorry, this was a silent merge conflict of topic/core-for-CI
when merging to create drm-tip.

I fixed last night with a drm-rerere/fixup. You shouldn't get
any build failure by now. Sorry for taking a long time to fix
this properly yesterday.

> 
> This reverts commit 5b39064d452ac9739d59c5183c8a7c90a5982acb.
> 
> Signed-off-by: José Roberto de Souza <jose.souza at intel.com>
> ---
>  drivers/rtc/rtc-cmos.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
> index df5ff7e78a14..3718386a9f0e 100644
> --- a/drivers/rtc/rtc-cmos.c
> +++ b/drivers/rtc/rtc-cmos.c
> @@ -652,9 +652,8 @@ static irqreturn_t cmos_interrupt(int irq, void *p)
>  	unsigned long	flags;
>  	u8		irqstat;
>  	u8		rtc_control;
> -	unsigned long	flags;
>  
> -	spin_lock_irqsave(&rtc_lock, flags);
> +	spin_lock(&rtc_lock);
>  
>  	/* When the HPET interrupt handler calls us, the interrupt
>  	 * status is passed as arg1 instead of the irq number.  But
> @@ -688,7 +687,7 @@ static irqreturn_t cmos_interrupt(int irq, void *p)
>  			hpet_mask_rtc_irq_bit(RTC_AIE);
>  		CMOS_READ(RTC_INTR_FLAGS);
>  	}
> -	spin_unlock_irqrestore(&rtc_lock, flags);
> +	spin_unlock(&rtc_lock);
>  
>  	if (is_intr(irqstat)) {
>  		rtc_update_irq(p, 1, irqstat);
> -- 
> 2.26.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx