From: "Randy.Dunlap" <rdunlap@xenotime.net>
To: lkml <linux-kernel@vger.kernel.org>
Cc: akpm <akpm@osdl.org>, torvalds <torvalds@osdl.org>,
paulus@samba.org, schwidefsky@de.ibm.com
Subject: [PATCH 2/9] Replace __ARCH_HAS_DO_SOFTIRQ with CONFIG_ARCH_DO_SOFTIRQ
Date: Mon, 7 Aug 2006 14:11:09 -0700 [thread overview]
Message-ID: <20060807141109.7e4d912d.rdunlap@xenotime.net> (raw)
In-Reply-To: <20060807120928.c0fe7045.rdunlap@xenotime.net>
From: Randy Dunlap <rdunlap@xenotime.net>
Replace __ARCH_HAS_DO_SOFTIRQ with CONFIG_ARCH_DO_SOFTIRQ.
Move it from header files to Kconfig space.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
arch/i386/Kconfig | 4 ++++
arch/powerpc/Kconfig | 3 +++
arch/s390/Kconfig | 3 +++
arch/x86_64/Kconfig | 3 +++
include/asm-i386/irq.h | 1 -
include/asm-powerpc/irq.h | 2 --
include/asm-s390/hardirq.h | 1 -
include/asm-x86_64/irq.h | 2 --
kernel/softirq.c | 2 +-
9 files changed, 14 insertions(+), 7 deletions(-)
--- linux-2618-rc4-arch.orig/kernel/softirq.c
+++ linux-2618-rc4-arch/kernel/softirq.c
@@ -249,7 +249,7 @@ restart:
_local_bh_enable();
}
-#ifndef __ARCH_HAS_DO_SOFTIRQ
+#ifndef CONFIG_ARCH_DO_SOFTIRQ
asmlinkage void do_softirq(void)
{
--- linux-2618-rc4-arch.orig/include/asm-i386/irq.h
+++ linux-2618-rc4-arch/include/asm-i386/irq.h
@@ -27,7 +27,6 @@ static __inline__ int irq_canonicalize(i
#ifdef CONFIG_4KSTACKS
extern void irq_ctx_init(int cpu);
extern void irq_ctx_exit(int cpu);
-# define __ARCH_HAS_DO_SOFTIRQ
#else
# define irq_ctx_init(cpu) do { } while (0)
# define irq_ctx_exit(cpu) do { } while (0)
--- linux-2618-rc4-arch.orig/include/asm-powerpc/irq.h
+++ linux-2618-rc4-arch/include/asm-powerpc/irq.h
@@ -813,8 +813,6 @@ extern int distribute_irqs;
struct irqaction;
struct pt_regs;
-#define __ARCH_HAS_DO_SOFTIRQ
-
extern void __do_softirq(void);
#ifdef CONFIG_IRQSTACKS
--- linux-2618-rc4-arch.orig/include/asm-s390/hardirq.h
+++ linux-2618-rc4-arch/include/asm-s390/hardirq.h
@@ -28,7 +28,6 @@ typedef struct {
#define local_softirq_pending() (S390_lowcore.softirq_pending)
#define __ARCH_IRQ_STAT
-#define __ARCH_HAS_DO_SOFTIRQ
#define HARDIRQ_BITS 8
--- linux-2618-rc4-arch.orig/include/asm-x86_64/irq.h
+++ linux-2618-rc4-arch/include/asm-x86_64/irq.h
@@ -53,6 +53,4 @@ static __inline__ int irq_canonicalize(i
extern void fixup_irqs(cpumask_t map);
#endif
-#define __ARCH_HAS_DO_SOFTIRQ 1
-
#endif /* _ASM_IRQ_H */
--- linux-2618-rc4-arch.orig/arch/i386/Kconfig
+++ linux-2618-rc4-arch/arch/i386/Kconfig
@@ -1162,6 +1162,10 @@ config GENERIC_PENDING_IRQ
depends on GENERIC_HARDIRQS && SMP
default y
+config ARCH_DO_SOFTIRQ
+ def_bool y
+ depends on 4KSTACKS
+
config X86_SMP
bool
depends on SMP && !X86_VOYAGER
--- linux-2618-rc4-arch.orig/arch/powerpc/Kconfig
+++ linux-2618-rc4-arch/arch/powerpc/Kconfig
@@ -34,6 +34,9 @@ config IRQ_PER_CPU
bool
default y
+config ARCH_DO_SOFTIRQ
+ def_bool y
+
config RWSEM_GENERIC_SPINLOCK
bool
--- linux-2618-rc4-arch.orig/arch/s390/Kconfig
+++ linux-2618-rc4-arch/arch/s390/Kconfig
@@ -33,6 +33,9 @@ config GENERIC_CALIBRATE_DELAY
config GENERIC_BUST_SPINLOCK
bool
+config ARCH_DO_SOFTIRQ
+ def_bool y
+
mainmenu "Linux Kernel Configuration"
config S390
--- linux-2618-rc4-arch.orig/arch/x86_64/Kconfig
+++ linux-2618-rc4-arch/arch/x86_64/Kconfig
@@ -549,6 +549,9 @@ config GENERIC_IRQ_PROBE
bool
default y
+config ARCH_DO_SOFTIRQ
+ def_bool y
+
# we have no ISA slots, but we do have ISA-style DMA.
config ISA_DMA_API
bool
---
next prev parent reply other threads:[~2006-08-07 21:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20060807120928.c0fe7045.rdunlap@xenotime.net>
2006-08-07 20:58 ` [PATCH 3/9] Replace ARCH_HAS_READ_CURRENT_TIMER with CONFIG_ARCH_READ_CURRENT_TIMER Randy.Dunlap
2006-08-07 21:00 ` [PATCH 4/9] Replace ARCH_HAS_NMI_WATCHDOG with CONFIG_ARCH_NMI_WATCHDOG Randy.Dunlap
2006-08-07 21:04 ` [PATCH 6/9] Replace ARCH_HAS_SOCKET_TYPES with CONFIG_ARCH_SOCKET_TYPES Randy.Dunlap
2006-08-07 21:05 ` [PATCH 7/9] Replace ARCH_HAS_VALID_PHYS_ADDR_RANGE with CONFIG_ARCH_VALID_PHYS_ADDR_RANGE Randy.Dunlap
2006-08-07 21:07 ` [PATCH 8/9] Replace __ARCH_HAS_NO_PAGE_ZERO_MAPPED with CONFIG_NO_PAGE_ZERO_MAPPED Randy.Dunlap
2006-08-07 21:09 ` [PATCH 9/9] Replace ARCH_HAS_POWER_INIT with CONFIG_ACPI_POWER_INIT Randy.Dunlap
2006-08-07 21:10 ` [PATCH 5/9] Replace ARCH_HAS_FLUSH_ANON_PAGE with CONFIG_ARCH_FLUSH_ANON_PAGE Randy.Dunlap
2006-08-08 8:52 ` Christoph Hellwig
2006-08-08 14:17 ` Kyle McMartin
2006-08-08 15:56 ` Randy.Dunlap
2006-08-07 21:11 ` Randy.Dunlap [this message]
2006-08-08 8:29 ` [PATCH 2/9] Replace __ARCH_HAS_DO_SOFTIRQ with CONFIG_ARCH_DO_SOFTIRQ Martin Schwidefsky
2006-08-07 21:12 ` [PATCH 1/9] Replace ARCH_HAS_SCHED_WAKE_IDLE with CONFIG_SCHED_SMT Randy.Dunlap
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=20060807141109.7e4d912d.rdunlap@xenotime.net \
--to=rdunlap@xenotime.net \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=paulus@samba.org \
--cc=schwidefsky@de.ibm.com \
--cc=torvalds@osdl.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
all inboxes | Powered by JetHome®