The patch titled
Replace ARCH_HAS_READ_CURRENT_TIMER with CONFIG_ARCH_READ_CURRENT_TIMER
has been added to the -mm tree. Its filename is
replace-arch_has_read_current_timer-with.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Replace ARCH_HAS_READ_CURRENT_TIMER with CONFIG_ARCH_READ_CURRENT_TIMER
From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
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@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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(-)
diff -puN arch/i386/Kconfig~replace-arch_has_read_current_timer-with arch/i386/Kconfig
--- a/arch/i386/Kconfig~replace-arch_has_read_current_timer-with
+++ a/arch/i386/Kconfig
@@ -201,6 +201,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
diff -puN arch/sparc64/Kconfig~replace-arch_has_read_current_timer-with arch/sparc64/Kconfig
--- a/arch/sparc64/Kconfig~replace-arch_has_read_current_timer-with
+++ a/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
diff -puN arch/x86_64/Kconfig~replace-arch_has_read_current_timer-with arch/x86_64/Kconfig
--- a/arch/x86_64/Kconfig~replace-arch_has_read_current_timer-with
+++ a/arch/x86_64/Kconfig
@@ -395,6 +395,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
diff -puN include/asm-i386/timex.h~replace-arch_has_read_current_timer-with include/asm-i386/timex.h
--- a/include/asm-i386/timex.h~replace-arch_has_read_current_timer-with
+++ a/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
diff -puN include/asm-sparc64/timex.h~replace-arch_has_read_current_timer-with include/asm-sparc64/timex.h
--- a/include/asm-sparc64/timex.h~replace-arch_has_read_current_timer-with
+++ a/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; \
diff -puN include/asm-x86_64/timex.h~replace-arch_has_read_current_timer-with include/asm-x86_64/timex.h
--- a/include/asm-x86_64/timex.h~replace-arch_has_read_current_timer-with
+++ a/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;
diff -puN init/calibrate.c~replace-arch_has_read_current_timer-with init/calibrate.c
--- a/init/calibrate.c~replace-arch_has_read_current_timer-with
+++ a/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().
_
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
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
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-fixes-for-debugfs.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_sched_wake_idle-with-config_sched_smt.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
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
