From: Christoph Hellwig <hch@lst.de>
To: gerg@uclinux.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] m68knommu: convert to asm-generic/hardirq.h
Date: Tue, 4 Aug 2009 16:52:44 +0200 [thread overview]
Message-ID: <20090804145244.GH20487@lst.de> (raw)
Signed-off-by: Christoph Hellwig <hch@lst.de>
Index: linux-2.6/arch/m68k/include/asm/hardirq_no.h
===================================================================
--- linux-2.6.orig/arch/m68k/include/asm/hardirq_no.h 2009-07-27 14:35:39.630898799 +0200
+++ linux-2.6/arch/m68k/include/asm/hardirq_no.h 2009-07-27 14:56:09.546901120 +0200
@@ -1,16 +1,8 @@
#ifndef __M68K_HARDIRQ_H
#define __M68K_HARDIRQ_H
-#include <linux/cache.h>
-#include <linux/threads.h>
#include <asm/irq.h>
-typedef struct {
- unsigned int __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
-
#define HARDIRQ_BITS 8
/*
@@ -23,5 +15,8 @@ typedef struct {
#endif
void ack_bad_irq(unsigned int irq);
+#define ack_bad_irq ack_bad_irq
+
+#include <asm-generic/hardirq.h>
#endif /* __M68K_HARDIRQ_H */
Index: linux-2.6/arch/m68knommu/kernel/irq.c
===================================================================
--- linux-2.6.orig/arch/m68knommu/kernel/irq.c 2009-07-27 14:53:45.783148910 +0200
+++ linux-2.6/arch/m68knommu/kernel/irq.c 2009-07-27 14:56:18.687931620 +0200
@@ -29,11 +29,6 @@ asmlinkage void do_IRQ(int irq, struct p
set_irq_regs(oldregs);
}
-void ack_bad_irq(unsigned int irq)
-{
- printk(KERN_ERR "IRQ: unexpected irq=%d\n", irq);
-}
-
static struct irq_chip m_irq_chip = {
.name = "M68K-INTC",
.enable = enable_vector,
next reply other threads:[~2009-08-04 14:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-04 14:52 Christoph Hellwig [this message]
2009-08-05 2:06 ` [PATCH] m68knommu: convert to asm-generic/hardirq.h Greg Ungerer
2009-08-05 4:53 ` Greg Ungerer
2009-08-05 15:08 ` Christoph Hellwig
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=20090804145244.GH20487@lst.de \
--to=hch@lst.de \
--cc=gerg@uclinux.org \
--cc=linux-kernel@vger.kernel.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 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.