[PATCH 3/9] Replace ARCH_HAS_READ_CURRENT_TIMER with CONFIG_ARCH_READ_CURRENT_TIMER

[PATCH 3/9] Replace ARCH_HAS_READ_CURRENT_TIMER with CONFIG_ARCH_READ_CURRENT_TIMER

[Randy.Dunlap]

From: Randy Dunlap <rdunlap@xenotime.net>

Replace ARCH_HAS_READ_CURRENT_TIMER with CONFIG_ARCH_READ_CURRENT_TIMER.
Move it from header files to Kconfig space.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 arch/i386/Kconfig           |    3 +++
 arch/sparc64/Kconfig        |    3 +++
 arch/x86_64/Kconfig         |    3 +++
 include/asm-i386/timex.h    |    1 -
 include/asm-sparc64/timex.h |    1 -
 include/asm-x86_64/timex.h  |    1 -
 init/calibrate.c            |    2 +-
 7 files changed, 10 insertions(+), 4 deletions(-)

--- linux-2618-rc4-arch.orig/init/calibrate.c
+++ linux-2618-rc4-arch/init/calibrate.c
@@ -19,7 +19,7 @@ static int __init lpj_setup(char *str)
 
 __setup("lpj=", lpj_setup);
 
-#ifdef ARCH_HAS_READ_CURRENT_TIMER
+#ifdef CONFIG_ARCH_READ_CURRENT_TIMER
 
 /* This routine uses the read_current_timer() routine and gets the
  * loops per jiffy directly, instead of guessing it using delay().
--- linux-2618-rc4-arch.orig/include/asm-i386/timex.h
+++ linux-2618-rc4-arch/include/asm-i386/timex.h
@@ -17,6 +17,5 @@
 
 
 extern int read_current_timer(unsigned long *timer_value);
-#define ARCH_HAS_READ_CURRENT_TIMER	1
 
 #endif
--- linux-2618-rc4-arch.orig/include/asm-sparc64/timex.h
+++ linux-2618-rc4-arch/include/asm-sparc64/timex.h
@@ -14,7 +14,6 @@
 typedef unsigned long cycles_t;
 #define get_cycles()	tick_ops->get_tick()
 
-#define ARCH_HAS_READ_CURRENT_TIMER	1
 #define read_current_timer(timer_val_p) 	\
 ({	*timer_val_p = tick_ops->get_tick();	\
 	0;					\
--- linux-2618-rc4-arch.orig/include/asm-x86_64/timex.h
+++ linux-2618-rc4-arch/include/asm-x86_64/timex.h
@@ -42,7 +42,6 @@ static __always_inline cycles_t get_cycl
 extern unsigned int cpu_khz;
 
 extern int read_current_timer(unsigned long *timer_value);
-#define ARCH_HAS_READ_CURRENT_TIMER	1
 
 extern struct vxtime_data vxtime;
 
--- linux-2618-rc4-arch.orig/arch/i386/Kconfig
+++ linux-2618-rc4-arch/arch/i386/Kconfig
@@ -202,6 +202,9 @@ config X86_CYCLONE_TIMER
 	default y
 	depends on X86_SUMMIT || X86_GENERICARCH
 
+config ARCH_READ_CURRENT_TIMER
+	def_bool y
+
 config ES7000_CLUSTERED_APIC
 	bool
 	default y
--- linux-2618-rc4-arch.orig/arch/sparc64/Kconfig
+++ linux-2618-rc4-arch/arch/sparc64/Kconfig
@@ -34,6 +34,9 @@ config ARCH_MAY_HAVE_PC_FDC
 	bool
 	default y
 
+config ARCH_READ_CURRENT_TIMER
+	def_bool y
+
 choice
 	prompt "Kernel page size"
 	default SPARC64_PAGE_SIZE_8KB
--- linux-2618-rc4-arch.orig/arch/x86_64/Kconfig
+++ linux-2618-rc4-arch/arch/x86_64/Kconfig
@@ -381,6 +381,9 @@ config HOTPLUG_CPU
 config ARCH_ENABLE_MEMORY_HOTPLUG
 	def_bool y
 
+config ARCH_READ_CURRENT_TIMER
+	def_bool y
+
 config HPET_TIMER
 	bool
 	default y


---

[PATCH 4/9] Replace ARCH_HAS_NMI_WATCHDOG with CONFIG_ARCH_NMI_WATCHDOG

[Randy.Dunlap]

From: Randy Dunlap <rdunlap@xenotime.net>

Replace ARCH_HAS_NMI_WATCHDOG with CONFIG_ARCH_NMI_WATCHDOG.
Move it from header files to Kconfig space.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 arch/i386/Kconfig        |    4 ++++
 arch/x86_64/Kconfig      |    4 ++++
 include/asm-i386/irq.h   |    4 ----
 include/asm-x86_64/irq.h |    4 ----
 include/linux/nmi.h      |    2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

--- linux-2618-rc4-arch.orig/include/asm-i386/irq.h
+++ linux-2618-rc4-arch/include/asm-i386/irq.h
@@ -20,10 +20,6 @@ static __inline__ int irq_canonicalize(i
 	return ((irq == 2) ? 9 : irq);
 }
 
-#ifdef CONFIG_X86_LOCAL_APIC
-# define ARCH_HAS_NMI_WATCHDOG		/* See include/linux/nmi.h */
-#endif
-
 #ifdef CONFIG_4KSTACKS
   extern void irq_ctx_init(int cpu);
   extern void irq_ctx_exit(int cpu);
--- linux-2618-rc4-arch.orig/include/asm-x86_64/irq.h
+++ linux-2618-rc4-arch/include/asm-x86_64/irq.h
@@ -44,10 +44,6 @@ static __inline__ int irq_canonicalize(i
 	return ((irq == 2) ? 9 : irq);
 }
 
-#ifdef CONFIG_X86_LOCAL_APIC
-#define ARCH_HAS_NMI_WATCHDOG		/* See include/linux/nmi.h */
-#endif
-
 #ifdef CONFIG_HOTPLUG_CPU
 #include <linux/cpumask.h>
 extern void fixup_irqs(cpumask_t map);
--- linux-2618-rc4-arch.orig/include/linux/nmi.h
+++ linux-2618-rc4-arch/include/linux/nmi.h
@@ -13,7 +13,7 @@
  * may be used to reset the timeout - for code which intentionally
  * disables interrupts for a long time. This call is stateless.
  */
-#ifdef ARCH_HAS_NMI_WATCHDOG
+#ifdef CONFIG_ARCH_NMI_WATCHDOG
 extern void touch_nmi_watchdog(void);
 #else
 # define touch_nmi_watchdog() do { } while(0)
--- linux-2618-rc4-arch.orig/arch/i386/Kconfig
+++ linux-2618-rc4-arch/arch/i386/Kconfig
@@ -292,6 +292,10 @@ config X86_LOCAL_APIC
 	depends on X86_UP_APIC || ((X86_VISWS || SMP) && !X86_VOYAGER)
 	default y
 
+config ARCH_NMI_WATCHDOG
+	def_bool y
+	depends on X86_LOCAL_APIC
+
 config X86_IO_APIC
 	bool
 	depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER))
--- linux-2618-rc4-arch.orig/arch/x86_64/Kconfig
+++ linux-2618-rc4-arch/arch/x86_64/Kconfig
@@ -213,6 +213,10 @@ config X86_LOCAL_APIC
 	bool
 	default y
 
+config ARCH_NMI_WATCHDOG
+	def_bool y
+	depends on X86_LOCAL_APIC
+
 config MTRR
 	bool "MTRR (Memory Type Range Register) support"
 	---help---


---

[PATCH 6/9] Replace ARCH_HAS_SOCKET_TYPES with CONFIG_ARCH_SOCKET_TYPES

[Randy.Dunlap]

From: Randy Dunlap <rdunlap@xenotime.net>

Replace ARCH_HAS_SOCKET_TYPES with CONFIG_ARCH_SOCKET_TYPES.
Move it from header files to Kconfig space.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 arch/mips/Kconfig         |    3 +++
 include/asm-mips/socket.h |    5 ++---
 include/linux/net.h       |    4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

--- linux-2618-rc4-arch.orig/include/asm-mips/socket.h
+++ linux-2618-rc4-arch/include/asm-mips/socket.h
@@ -77,7 +77,8 @@ To add: #define SO_REUSEPORT 0x0200	/* A
  *
  * Please notice that for binary compat reasons MIPS has to
  * override the enum sock_type in include/linux/net.h, so
- * we define ARCH_HAS_SOCKET_TYPES here.
+ * include/linux/net.h checks for ifdef CONFIG_ARCH_SOCKET_TYPES
+ * to see if these are already defined.
  *
  * @SOCK_DGRAM - datagram (conn.less) socket
  * @SOCK_STREAM - stream (connection) socket
@@ -99,8 +100,6 @@ enum sock_type {
 
 #define SOCK_MAX (SOCK_PACKET + 1)
 
-#define ARCH_HAS_SOCKET_TYPES 1
-
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_SOCKET_H */
--- linux-2618-rc4-arch.orig/include/linux/net.h
+++ linux-2618-rc4-arch/include/linux/net.h
@@ -63,7 +63,7 @@ typedef enum {
 #define SOCK_PASSCRED		3
 #define SOCK_PASSSEC		4
 
-#ifndef ARCH_HAS_SOCKET_TYPES
+#ifndef CONFIG_ARCH_SOCKET_TYPES
 /**
  * enum sock_type - Socket types
  * @SOCK_STREAM: stream (connection) socket
@@ -91,7 +91,7 @@ enum sock_type {
 
 #define SOCK_MAX (SOCK_PACKET + 1)
 
-#endif /* ARCH_HAS_SOCKET_TYPES */
+#endif /* CONFIG_ARCH_SOCKET_TYPES */
 
 /**
  *  struct socket - general BSD socket
--- linux-2618-rc4-arch.orig/arch/mips/Kconfig
+++ linux-2618-rc4-arch/arch/mips/Kconfig
@@ -915,6 +915,9 @@ config MIPS_NILE4
 config MIPS_DISABLE_OBSOLETE_IDE
 	bool
 
+config ARCH_SOCKET_TYPES
+	def_bool y
+
 #
 # Endianess selection.  Suffiently obscure so many users don't know what to
 # answer,so we try hard to limit the available choices.  Also the use of a


---

[PATCH 7/9] Replace ARCH_HAS_VALID_PHYS_ADDR_RANGE with CONFIG_ARCH_VALID_PHYS_ADDR_RANGE

[Randy.Dunlap]

From: Randy Dunlap <rdunlap@xenotime.net>

Replace ARCH_HAS_VALID_PHYS_ADDR_RANGE with CONFIG_ARCH_VALID_PHYS_ADDR_RANGE.
Move it from header files to Kconfig space.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 arch/ia64/Kconfig     |    3 +++
 drivers/char/mem.c    |    2 +-
 include/asm-ia64/io.h |    1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

--- linux-2618-rc4-arch.orig/drivers/char/mem.c
+++ linux-2618-rc4-arch/drivers/char/mem.c
@@ -86,7 +86,7 @@ static inline int uncached_access(struct
 #endif
 }
 
-#ifndef ARCH_HAS_VALID_PHYS_ADDR_RANGE
+#ifndef CONFIG_ARCH_VALID_PHYS_ADDR_RANGE
 static inline int valid_phys_addr_range(unsigned long addr, size_t count)
 {
 	if (addr + count > __pa(high_memory))
--- linux-2618-rc4-arch.orig/include/asm-ia64/io.h
+++ linux-2618-rc4-arch/include/asm-ia64/io.h
@@ -87,7 +87,6 @@ phys_to_virt (unsigned long address)
 	return (void *) (address + PAGE_OFFSET);
 }
 
-#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
 extern u64 kern_mem_attribute (unsigned long phys_addr, unsigned long size);
 extern int valid_phys_addr_range (unsigned long addr, size_t count); /* efi.c */
 extern int valid_mmap_phys_addr_range (unsigned long pfn, size_t count);
--- linux-2618-rc4-arch.orig/arch/ia64/Kconfig
+++ linux-2618-rc4-arch/arch/ia64/Kconfig
@@ -386,6 +386,9 @@ config HAVE_ARCH_NODEDATA_EXTENSION
 	def_bool y
 	depends on NUMA
 
+config ARCH_VALID_PHYS_ADDR_RANGE
+	def_bool y
+
 config IA32_SUPPORT
 	bool "Support for Linux/x86 binaries"
 	help


---

[PATCH 8/9] Replace __ARCH_HAS_NO_PAGE_ZERO_MAPPED with CONFIG_NO_PAGE_ZERO_MAPPED

[Randy.Dunlap]

From: Randy Dunlap <rdunlap@xenotime.net>

Replace __ARCH_HAS_NO_PAGE_ZERO_MAPPED with CONFIG_NO_PAGE_ZERO_MAPPED.
Move it from header files to Kconfig space.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 arch/m68k/Kconfig      |    3 +++
 arch/sparc/Kconfig     |    3 +++
 drivers/char/mem.c     |    8 ++++----
 include/asm-m68k/io.h  |    2 --
 include/asm-sparc/io.h |    2 --
 5 files changed, 10 insertions(+), 8 deletions(-)

--- linux-2618-rc4-arch.orig/drivers/char/mem.c
+++ linux-2618-rc4-arch/drivers/char/mem.c
@@ -115,7 +115,7 @@ static ssize_t read_mem(struct file * fi
 	if (!valid_phys_addr_range(p, count))
 		return -EFAULT;
 	read = 0;
-#ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED
+#ifdef CONFIG_NO_PAGE_ZERO_MAPPED
 	/* we don't have page 0 mapped on sparc and m68k.. */
 	if (p < PAGE_SIZE) {
 		sz = PAGE_SIZE - p;
@@ -175,7 +175,7 @@ static ssize_t write_mem(struct file * f
 
 	written = 0;
 
-#ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED
+#ifdef CONFIG_NO_PAGE_ZERO_MAPPED
 	/* we don't have page 0 mapped on sparc and m68k.. */
 	if (p < PAGE_SIZE) {
 		unsigned long sz = PAGE_SIZE - p;
@@ -333,7 +333,7 @@ static ssize_t read_kmem(struct file *fi
 		if (count > (unsigned long) high_memory - p)
 			low_count = (unsigned long) high_memory - p;
 
-#ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED
+#ifdef CONFIG_NO_PAGE_ZERO_MAPPED
 		/* we don't have page 0 mapped on sparc and m68k.. */
 		if (p < PAGE_SIZE && low_count > 0) {
 			size_t tmp = PAGE_SIZE - p;
@@ -411,7 +411,7 @@ do_write_kmem(void *p, unsigned long rea
 	unsigned long copied;
 
 	written = 0;
-#ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED
+#ifdef CONFIG_NO_PAGE_ZERO_MAPPED
 	/* we don't have page 0 mapped on sparc and m68k.. */
 	if (realp < PAGE_SIZE) {
 		unsigned long sz = PAGE_SIZE - realp;
--- linux-2618-rc4-arch.orig/include/asm-m68k/io.h
+++ linux-2618-rc4-arch/include/asm-m68k/io.h
@@ -360,8 +360,6 @@ extern void dma_cache_inv(unsigned long 
 
 #endif /* __KERNEL__ */
 
-#define __ARCH_HAS_NO_PAGE_ZERO_MAPPED		1
-
 /*
  * Convert a physical pointer to a virtual kernel pointer for /dev/mem
  * access
--- linux-2618-rc4-arch.orig/include/asm-sparc/io.h
+++ linux-2618-rc4-arch/include/asm-sparc/io.h
@@ -290,8 +290,6 @@ extern void sbus_iounmap(volatile void _
 
 #endif
 
-#define __ARCH_HAS_NO_PAGE_ZERO_MAPPED		1
-
 /*
  * Convert a physical pointer to a virtual kernel pointer for /dev/mem
  * access
--- linux-2618-rc4-arch.orig/arch/m68k/Kconfig
+++ linux-2618-rc4-arch/arch/m68k/Kconfig
@@ -366,6 +366,9 @@ config 060_WRITETHROUGH
 	  is hardwired on.  The 53c710 SCSI driver is known to suffer from
 	  this problem.
 
+config NO_PAGE_ZERO_MAPPED
+	def_bool y
+
 source "mm/Kconfig"
 
 endmenu
--- linux-2618-rc4-arch.orig/arch/sparc/Kconfig
+++ linux-2618-rc4-arch/arch/sparc/Kconfig
@@ -229,6 +229,9 @@ config SUNOS_EMUL
 
 source "mm/Kconfig"
 
+config NO_PAGE_ZERO_MAPPED
+	def_bool y
+
 endmenu
 
 source "net/Kconfig"


---

[PATCH 9/9] Replace ARCH_HAS_POWER_INIT with CONFIG_ACPI_POWER_INIT

[Randy.Dunlap]

From: Randy Dunlap <rdunlap@xenotime.net>

Replace ARCH_HAS_POWER_INIT with CONFIG_ACPI_POWER_INIT.
Move it from header files to Kconfig space.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 drivers/acpi/Kconfig      |    4 ++++
 include/acpi/processor.h  |    2 +-
 include/asm-i386/acpi.h   |    2 --
 include/asm-x86_64/acpi.h |    2 --
 4 files changed, 5 insertions(+), 5 deletions(-)

--- linux-2618-rc4-arch.orig/include/acpi/processor.h
+++ linux-2618-rc4-arch/include/acpi/processor.h
@@ -203,7 +203,7 @@ extern struct acpi_processor_errata erra
 
 void arch_acpi_processor_init_pdc(struct acpi_processor *pr);
 
-#ifdef ARCH_HAS_POWER_INIT
+#ifdef CONFIG_ACPI_POWER_INIT
 void acpi_processor_power_init_bm_check(struct acpi_processor_flags *flags,
 					unsigned int cpu);
 #else
--- linux-2618-rc4-arch.orig/drivers/acpi/Kconfig
+++ linux-2618-rc4-arch/drivers/acpi/Kconfig
@@ -295,6 +295,10 @@ config ACPI_POWER
 	bool
 	default y
 
+config ACPI_POWER_INIT
+	def_bool y
+	depends on X86
+
 config ACPI_SYSTEM
 	bool
 	default y
--- linux-2618-rc4-arch.orig/include/asm-i386/acpi.h
+++ linux-2618-rc4-arch/include/asm-i386/acpi.h
@@ -181,8 +181,6 @@ extern void acpi_reserve_bootmem(void);
 
 extern u8 x86_acpiid_to_apicid[];
 
-#define ARCH_HAS_POWER_INIT	1
-
 #endif /*__KERNEL__*/
 
 #endif /*_ASM_ACPI_H*/
--- linux-2618-rc4-arch.orig/include/asm-x86_64/acpi.h
+++ linux-2618-rc4-arch/include/asm-x86_64/acpi.h
@@ -162,8 +162,6 @@ extern int acpi_pci_disabled;
 
 extern u8 x86_acpiid_to_apicid[];
 
-#define ARCH_HAS_POWER_INIT 1
-
 extern int acpi_skip_timer_override;
 
 #endif /*__KERNEL__*/


---

[PATCH 5/9] Replace ARCH_HAS_FLUSH_ANON_PAGE with CONFIG_ARCH_FLUSH_ANON_PAGE

[Randy.Dunlap]

From: Randy Dunlap <rdunlap@xenotime.net>

Replace ARCH_HAS_FLUSH_ANON_PAGE with CONFIG_ARCH_FLUSH_ANON_PAGE.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 arch/parisc/Kconfig             |    3 +++
 include/asm-parisc/cacheflush.h |    1 -
 include/linux/highmem.h         |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

--- linux-2618-rc4-arch.orig/include/asm-parisc/cacheflush.h
+++ linux-2618-rc4-arch/include/asm-parisc/cacheflush.h
@@ -189,7 +189,6 @@ flush_anon_page(struct page *page, unsig
 	if (PageAnon(page))
 		flush_user_dcache_page(vmaddr);
 }
-#define ARCH_HAS_FLUSH_ANON_PAGE
 
 static inline void
 flush_kernel_dcache_page(struct page *page)
--- linux-2618-rc4-arch.orig/include/linux/highmem.h
+++ linux-2618-rc4-arch/include/linux/highmem.h
@@ -6,7 +6,7 @@
 
 #include <asm/cacheflush.h>
 
-#ifndef ARCH_HAS_FLUSH_ANON_PAGE
+#ifndef CONFIG_ARCH_FLUSH_ANON_PAGE
 static inline void flush_anon_page(struct page *page, unsigned long vmaddr)
 {
 }
--- linux-2618-rc4-arch.orig/arch/parisc/Kconfig
+++ linux-2618-rc4-arch/arch/parisc/Kconfig
@@ -16,6 +16,9 @@ config PARISC
 config MMU
 	def_bool y
 
+config ARCH_FLUSH_ANON_PAGE
+	def_bool y
+
 config STACK_GROWSUP
 	def_bool y
 


---

[PATCH 2/9] Replace __ARCH_HAS_DO_SOFTIRQ with CONFIG_ARCH_DO_SOFTIRQ

[Randy.Dunlap]

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


---

[PATCH 1/9] Replace ARCH_HAS_SCHED_WAKE_IDLE with CONFIG_SCHED_SMT

[Randy.Dunlap]

From: Randy Dunlap <rdunlap@xenotime.net>

Replace ARCH_HAS_SCHED_WAKE_IDLE with CONFIG_SCHED_SMT.
Move it from header files to Kconfig space.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 include/linux/topology.h |    6 ++----
 kernel/sched.c           |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

--- linux-2618-rc4-arch.orig/include/linux/topology.h
+++ linux-2618-rc4-arch/include/linux/topology.h
@@ -80,10 +80,8 @@
  * and allow arch-specific performance tuning of sched_domains.
  */
 #ifdef CONFIG_SCHED_SMT
-/* MCD - Do we really need this?  It is always on if CONFIG_SCHED_SMT is,
- * so can't we drop this in favor of CONFIG_SCHED_SMT?
- */
-#define ARCH_HAS_SCHED_WAKE_IDLE
+/* CONFIG_SCHED_SMT is synonymous with old ARCH_HAS_SCHED_WAKE_IDLE */
+
 /* Common values for SMT siblings */
 #ifndef SD_SIBLING_INIT
 #define SD_SIBLING_INIT (struct sched_domain) {		\
--- linux-2618-rc4-arch.orig/kernel/sched.c
+++ linux-2618-rc4-arch/kernel/sched.c
@@ -1315,7 +1315,7 @@ nextlevel:
  *
  * Returns the CPU we should wake onto.
  */
-#if defined(ARCH_HAS_SCHED_WAKE_IDLE)
+#ifdef CONFIG_SCHED_SMT
 static int wake_idle(int cpu, struct task_struct *p)
 {
 	cpumask_t tmp;


---

Re: [PATCH 2/9] Replace __ARCH_HAS_DO_SOFTIRQ with CONFIG_ARCH_DO_SOFTIRQ

[Martin Schwidefsky]

On Mon, 2006-08-07 at 14:11 -0700, Randy.Dunlap wrote:
> 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>

Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

-- 
blue skies,
  Martin.

Martin Schwidefsky
Linux for zSeries Development & Services
IBM Deutschland Entwicklung GmbH

"Reality continues to ruin my life." - Calvin.

Re: [PATCH 5/9] Replace ARCH_HAS_FLUSH_ANON_PAGE with CONFIG_ARCH_FLUSH_ANON_PAGE

[Christoph Hellwig]

On Mon, Aug 07, 2006 at 02:10:08PM -0700, Randy.Dunlap wrote:
> From: Randy Dunlap <rdunlap@xenotime.net>
> 
> Replace ARCH_HAS_FLUSH_ANON_PAGE with CONFIG_ARCH_FLUSH_ANON_PAGE.

Please just put the dummy flush_anon_page in every architectures header.

Re: [PATCH 5/9] Replace ARCH_HAS_FLUSH_ANON_PAGE with CONFIG_ARCH_FLUSH_ANON_PAGE

[Kyle McMartin]

On Tue, Aug 08, 2006 at 09:52:23AM +0100, Christoph Hellwig wrote:
> Please just put the dummy flush_anon_page in every architectures header.
> 

That sounds much cleaner.

Re: [PATCH 5/9] Replace ARCH_HAS_FLUSH_ANON_PAGE with CONFIG_ARCH_FLUSH_ANON_PAGE

[Randy.Dunlap]

On Tue, 8 Aug 2006 09:52:23 +0100 Christoph Hellwig wrote:

> On Mon, Aug 07, 2006 at 02:10:08PM -0700, Randy.Dunlap wrote:
> > From: Randy Dunlap <rdunlap@xenotime.net>
> > 
> > Replace ARCH_HAS_FLUSH_ANON_PAGE with CONFIG_ARCH_FLUSH_ANON_PAGE.
> 
> Please just put the dummy flush_anon_page in every architectures header.

Nope, someone else can do that.

---
~Randy