]> git.baikalelectronics.ru Git - kernel.git/commit
xtensa: fix build fail on undefined ack_bad_irq
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Thu, 26 Apr 2012 18:23:22 +0000 (14:23 -0400)
committerPaul Gortmaker <paul.gortmaker@windriver.com>
Thu, 26 Apr 2012 22:35:32 +0000 (18:35 -0400)
commit8d630acb02403020b76e7f2da945bf4385823067
tree17f1cc49f53cbf37005ae5383304530fd66473b7
parent50ee5f335a8ea69a28b8291727fcde30893fbc99
xtensa: fix build fail on undefined ack_bad_irq

Commit 16b22b72a4dbb0c928f1117c4e3a37399ff235c9

    "xtensa: convert to asm-generic/hardirq.h"

converted over to using the asm-generic parts, but it also
added the sentinel

#define ack_bad_irq ack_bad_irq

which tells asm-generic to _not_ use the common ack_bad_irq.

Since 16b22b7 deleted the duplicated code from the arch specific
file, we _do_ want the asm-generic one in scope.  So delete
the trigger define above which hides it.  In doing so we'll
realize that we've got to delete the almost-duplicate prototype
as well to avoid "static declaration ... follows non-static".

Cc: Christoph Hellwig <hch@lst.de>
Cc: Chris Zankel <chris@zankel.net>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
arch/xtensa/include/asm/hardirq.h