From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: "José Roberto de Souza" <jose.souza@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH 2/2] Revert "rtc/cmos: Protect rtc_lock from interrupts"
Date: Tue, 14 Apr 2020 06:13:29 -0700 [thread overview]
Message-ID: <20200414131329.GC4008304@intel.com> (raw)
In-Reply-To: <20200414000844.101873-2-jose.souza@intel.com>
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@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@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-04-14 13:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-14 0:08 [Intel-gfx] [PATCH 1/2] drm/i915/display: Load DP_TP_CTL/STATUS offset before use it José Roberto de Souza
2020-04-14 0:08 ` [Intel-gfx] [PATCH 2/2] Revert "rtc/cmos: Protect rtc_lock from interrupts" José Roberto de Souza
2020-04-14 13:13 ` Rodrigo Vivi [this message]
2020-04-14 22:33 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [1/2] drm/i915/display: Load DP_TP_CTL/STATUS offset before use it Patchwork
2020-04-14 23:03 ` Souza, Jose
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200414131329.GC4008304@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jose.souza@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.