The patch titled
Replace __ARCH_HAS_DO_SOFTIRQ with CONFIG_ARCH_DO_SOFTIRQ
has been removed from the -mm tree. Its filename is
replace-__arch_has_do_softirq-with.patch
This patch was dropped because it looks like we should be adding all-arch stubs
------------------------------------------------------
Subject: Replace __ARCH_HAS_DO_SOFTIRQ with CONFIG_ARCH_DO_SOFTIRQ
From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Replace __ARCH_HAS_DO_SOFTIRQ with CONFIG_ARCH_DO_SOFTIRQ. Move it from
header files to Kconfig space.
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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(-)
diff -puN arch/i386/Kconfig~replace-__arch_has_do_softirq-with arch/i386/Kconfig
--- a/arch/i386/Kconfig~replace-__arch_has_do_softirq-with
+++ a/arch/i386/Kconfig
@@ -1191,6 +1191,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
diff -puN arch/powerpc/Kconfig~replace-__arch_has_do_softirq-with arch/powerpc/Kconfig
--- a/arch/powerpc/Kconfig~replace-__arch_has_do_softirq-with
+++ a/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
diff -puN arch/s390/Kconfig~replace-__arch_has_do_softirq-with arch/s390/Kconfig
--- a/arch/s390/Kconfig~replace-__arch_has_do_softirq-with
+++ a/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
diff -puN arch/x86_64/Kconfig~replace-__arch_has_do_softirq-with arch/x86_64/Kconfig
--- a/arch/x86_64/Kconfig~replace-__arch_has_do_softirq-with
+++ a/arch/x86_64/Kconfig
@@ -575,6 +575,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
diff -puN include/asm-i386/irq.h~replace-__arch_has_do_softirq-with include/asm-i386/irq.h
--- a/include/asm-i386/irq.h~replace-__arch_has_do_softirq-with
+++ a/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)
diff -puN include/asm-powerpc/irq.h~replace-__arch_has_do_softirq-with include/asm-powerpc/irq.h
--- a/include/asm-powerpc/irq.h~replace-__arch_has_do_softirq-with
+++ a/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
diff -puN include/asm-s390/hardirq.h~replace-__arch_has_do_softirq-with include/asm-s390/hardirq.h
--- a/include/asm-s390/hardirq.h~replace-__arch_has_do_softirq-with
+++ a/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
diff -puN include/asm-x86_64/irq.h~replace-__arch_has_do_softirq-with include/asm-x86_64/irq.h
--- a/include/asm-x86_64/irq.h~replace-__arch_has_do_softirq-with
+++ a/include/asm-x86_64/irq.h
@@ -51,6 +51,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 */
diff -puN kernel/softirq.c~replace-__arch_has_do_softirq-with kernel/softirq.c
--- a/kernel/softirq.c~replace-__arch_has_do_softirq-with
+++ a/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)
{
_
Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are
acpi-bus-add-missing-newline.patch
acpi-handle-firmware_register-init-errors.patch
acpi-scan-handle-kset-kobject-errors.patch
acpi-fix-printk-format-warnings.patch
sysfs_remove_bin_file-no-return-value-dump_stack-on.patch
kobject-must_check-fixes.patch
drivers-base-check-errors.patch
sysfs-add-proper-sysfs_init-prototype.patch
bttv-must_check-fixes.patch
git-lxdialog.patch
mtd-printk-format-warning.patch
pcmcia-ds-must_check-fixes.patch
libsas-externs-not-needed.patch
pcie-check-and-return-bus_register-errors.patch
pcie-check-and-return-bus_register-errors-fix.patch
git-scsi-misc.patch
aic7-cleanup-module_parm_desc-strings.patch
dc395x-fix-printk-format-warning.patch
scsi-target-printk-format-warnings.patch
usbnet-printk-format-warning.patch
add-kerneldocs-for-some-functions-in-mm-memoryc.patch
tiacx-sparse-cleanups.patch
consistently-use-max_errno-in-__syscall_return.patch
consistently-use-max_errno-in-__syscall_return-fix.patch
eisa-bus-modalias-attributes-support-1.patch
kernel-params-must_check-fixes.patch
blockdevc-check-errors.patch
block-handle-subsystem_register-init-errors.patch
fs-namespace-handle-init-registration-errors.patch
kernel-doc-for-relay-interface.patch
kernel-doc-move-filesystems-together.patch
include-documentation-for-functions-in-drivers-base-classc.patch
fix-parameter-names-in-drivers-base-classc.patch
fix-kerneldoc-comments-in-kernel-timerc-fix.patch
replace-__arch_has_do_softirq-with.patch
replace-arch_has_read_current_timer-with.patch
replace-arch_has_nmi_watchdog-with.patch
replace-arch_has_flush_anon_page-with.patch
replace-arch_has_socket_types-with.patch
replace-arch_has_valid_phys_addr_range-with.patch
replace-__arch_has_no_page_zero_mapped-with.patch
replace-arch_has_power_init-with-config_acpi_power_init.patch
fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-printk-format-warning.patch
ecryptfs-fix-printk-format-warnings.patch
ide-core-must_check-fixes.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
