From: Greg Ungerer <gerg@linux-m68k.org>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] m68k: Switch to asm-generic/hardirq.h
Date: Mon, 13 Jan 2020 11:58:44 +1000 [thread overview]
Message-ID: <55c34fc6-cac0-0c53-37d7-d46658a327fc@linux-m68k.org> (raw)
In-Reply-To: <20200112174854.2726-1-geert@linux-m68k.org>
Hi Geert,
On 13/1/20 3:48 am, Geert Uytterhoeven wrote:
> Classic m68k with MMU was converted to generic hardirqs a long time ago,
> and there are no longer include dependency issues preventing the direct
> use of asm-generic/hardirq.h.
>
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Looks good.
Acked-by: Greg Ungerer <gerg@linux-m68k.org>
Regards
Greg
> ---
> arch/m68k/include/asm/Kbuild | 1 +
> arch/m68k/include/asm/hardirq.h | 29 -----------------------------
> 2 files changed, 1 insertion(+), 29 deletions(-)
> delete mode 100644 arch/m68k/include/asm/hardirq.h
>
> diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
> index 591d53b763b71b27..63f12afc48749c96 100644
> --- a/arch/m68k/include/asm/Kbuild
> +++ b/arch/m68k/include/asm/Kbuild
> @@ -8,6 +8,7 @@ generic-y += emergency-restart.h
> generic-y += exec.h
> generic-y += extable.h
> generic-y += futex.h
> +generic-y += hardirq.h
> generic-y += hw_irq.h
> generic-y += irq_regs.h
> generic-y += irq_work.h
> diff --git a/arch/m68k/include/asm/hardirq.h b/arch/m68k/include/asm/hardirq.h
> deleted file mode 100644
> index 11793165445df45a..0000000000000000
> --- a/arch/m68k/include/asm/hardirq.h
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> -#ifndef __M68K_HARDIRQ_H
> -#define __M68K_HARDIRQ_H
> -
> -#include <linux/threads.h>
> -#include <linux/cache.h>
> -#include <asm/irq.h>
> -
> -#ifdef CONFIG_MMU
> -
> -static inline void ack_bad_irq(unsigned int irq)
> -{
> - pr_crit("unexpected IRQ trap at vector %02x\n", irq);
> -}
> -
> -/* entry.S is sensitive to the offsets of these fields */
> -typedef struct {
> - unsigned int __softirq_pending;
> -} ____cacheline_aligned irq_cpustat_t;
> -
> -#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
> -
> -#else
> -
> -#include <asm-generic/hardirq.h>
> -
> -#endif /* !CONFIG_MMU */
> -
> -#endif
>
next prev parent reply other threads:[~2020-01-13 1:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-12 17:48 [PATCH] m68k: Switch to asm-generic/hardirq.h Geert Uytterhoeven
2020-01-13 1:58 ` Greg Ungerer [this message]
2020-02-10 11:16 ` Geert Uytterhoeven
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=55c34fc6-cac0-0c53-37d7-d46658a327fc@linux-m68k.org \
--to=gerg@linux-m68k.org \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.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).