From: "Randy.Dunlap" <rdunlap@xenotime.net>
To: lkml <linux-kernel@vger.kernel.org>
Cc: akpm <akpm@osdl.org>, torvalds <torvalds@osdl.org>
Subject: [PATCH 3/9] Replace ARCH_HAS_READ_CURRENT_TIMER with CONFIG_ARCH_READ_CURRENT_TIMER
Date: Mon, 7 Aug 2006 13:58:40 -0700 [thread overview]
Message-ID: <20060807135840.753d186b.rdunlap@xenotime.net> (raw)
In-Reply-To: <20060807120928.c0fe7045.rdunlap@xenotime.net>
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
---
next parent reply other threads:[~2006-08-07 21:11 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 ` Randy.Dunlap [this message]
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 ` [PATCH 2/9] Replace __ARCH_HAS_DO_SOFTIRQ with CONFIG_ARCH_DO_SOFTIRQ Randy.Dunlap
2006-08-08 8:29 ` 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=20060807135840.753d186b.rdunlap@xenotime.net \
--to=rdunlap@xenotime.net \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--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®