linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: OMAP2+: PM: fix IRQ_NOAUTOEN removal by mis-merge
Date: Fri, 29 Jun 2012 07:20:32 -0700	[thread overview]
Message-ID: <20120629142032.GI4202@atomide.com> (raw)
In-Reply-To: <1340978614-12558-1-git-send-email-khilman@ti.com>

* Kevin Hilman <khilman@ti.com> [120629 07:08]:
> commit 99b59df0 (ARM: OMAP3: PM: fix shared PRCM interrupt leave
> disabled at boot) added IRQ_NOAUTOEN to the PRCM interrupt so it could
> be enabled later if needed.  However, this commit was partially undone
> when merging the IO daisy chain rework in 9a17d88e (Merge tag
> 'omap-devel-c-for-3.6' of
> git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into
> devel-pm
> 
> This patch adds back the IRQ_NOAUTOEN fix that was removed by the
> merge resolution.
> 
> This also fixes the following boot-time warning that showed up after
> merging the IO daisy chain rework:
> 
> [    3.849334] WARNING: at kernel/irq/manage.c:436 enable_irq+0x3c/0x78()
> [    3.856231] Unbalanced enable for IRQ 297
> [    3.860473] Modules linked in:
> [    3.863739] [<c001a114>] (unwind_backtrace+0x0/0xf0) from [<c003c7e8>] (warn_slowpath_common+0x4c/0x64)
> [    3.873687] [<c003c7e8>] (warn_slowpath_common+0x4c/0x64) from [<c003c894>] (warn_slowpath_fmt+0x30/0x40)
> [    3.883819] [<c003c894>] (warn_slowpath_fmt+0x30/0x40) from [<c00993e0>] (enable_irq+0x3c/0x78)
> [    3.893035] [<c00993e0>] (enable_irq+0x3c/0x78) from [<c067b1e8>] (omap3_pm_init+0x328/0x5f4)
> [    3.902099] [<c067b1e8>] (omap3_pm_init+0x328/0x5f4) from [<c067161c>] (init_machine_late+0x1c/0x28)
> [    3.911773] [<c067161c>] (init_machine_late+0x1c/0x28) from [<c0008648>] (do_one_initcall+0x34/0x178)
> [    3.921539] [<c0008648>] (do_one_initcall+0x34/0x178) from [<c066e8f4>] (kernel_init+0xfc/0x1c0)
> [    3.930847] [<c066e8f4>] (kernel_init+0xfc/0x1c0) from [<c00140b0>] (kernel_thread_exit+0x0/0x8)
> [    3.940246] ---[ end trace 55a0ad32ca2ca682 ]---
> 
> Reported-by: Javier Martinez Canillas <javier@dowhile0.org>
> Cc: Paul Walmsley <paul@pwsan.com>
> Signed-off-by: Kevin Hilman <khilman@ti.com>
> ---
> Tony, this applies on top of your current devel-pm branch.

Thanks applying into devel-pm.

Tony

  reply	other threads:[~2012-06-29 14:20 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-29 14:03 [PATCH] ARM: OMAP2+: PM: fix IRQ_NOAUTOEN removal by mis-merge Kevin Hilman
2012-06-29 14:20 ` Tony Lindgren [this message]
2012-06-29 19:26 ` Paul Walmsley

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=20120629142032.GI4202@atomide.com \
    --to=tony@atomide.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).