http://lia64.bkbits.net/linux-ia64-test-2.6.9
aegl@agluck-lia64.sc.intel.com|ChangeSet|20040916191438|59923 aegl
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/10/01 19:36:45-07:00 akpm@bix.(none)
# Merge http://lia64.bkbits.net/linux-ia64-test-2.6.9
# into bix.(none):/usr/src/bk-ia64
#
# kernel/timer.c
# 2004/10/01 19:36:42-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# include/asm-ia64/mca.h
# 2004/10/01 19:36:42-07:00 akpm@bix.(none) +0 -7
# Auto merged
#
# drivers/char/hpet.c
# 2004/10/01 19:36:42-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ia64/pci/pci.c
# 2004/10/01 19:36:42-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ia64/mm/discontig.c
# 2004/10/01 19:36:42-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ia64/kernel/perfmon.c
# 2004/10/01 19:36:42-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ia64/kernel/mca.c
# 2004/10/01 19:36:42-07:00 akpm@bix.(none) +0 -35
# Auto merged
#
# arch/ia64/kernel/acpi.c
# 2004/10/01 19:36:42-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ia64/kernel/Makefile
# 2004/10/01 19:36:42-07:00 akpm@bix.(none) +0 -2
# Auto merged
#
# arch/ia64/configs/sn2_defconfig
# 2004/10/01 19:36:42-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ia64/Kconfig
# 2004/10/01 19:36:41-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# BitKeeper/deleted/.del-mca_drv_asm.S
# 2004/10/01 19:36:41-07:00 akpm@bix.(none) +0 -0
# Delete: arch/ia64/kernel/mca_drv_asm.S
#
# BitKeeper/deleted/.del-mca_drv.h
# 2004/10/01 19:36:36-07:00 akpm@bix.(none) +0 -0
# Delete: arch/ia64/kernel/mca_drv.h
#
# BitKeeper/deleted/.del-mca_drv.c
# 2004/10/01 19:36:22-07:00 akpm@bix.(none) +0 -0
# Delete: arch/ia64/kernel/mca_drv.c
#
# ChangeSet
# 2004/09/16 18:00:23+00:00 tony.luck@intel.com
# [IA64] mca.h, mca_drv.c: cleanup extern declarations
#
# Move extern declarations of ia64_{reg,unreg}_MCA_extension()
# to mca.h. Delete declaration of ia64_mca_ucmc_other_recover_fp()
# which doesn't exist.
#
# Patch supplied by Hidetoshi Seto.
#
# Signed-off-by: Tony Luck <tony.luck@intel.com>
#
# include/asm-ia64/mca.h
# 2004/09/16 17:55:56+00:00 aegl@agluck-lia64.sc.intel.com +2 -1
# cleanup extern definitions
#
# arch/ia64/kernel/mca_drv.c
# 2004/09/16 17:55:56+00:00 aegl@agluck-lia64.sc.intel.com +0 -2
# cleanup extern definitions
#
# ChangeSet
# 2004/09/15 18:25:06+00:00 seto.hidetoshi@jp.fujitsu.com
# [IA64] Recovery from user-mode memory error
#
# This is the latest/Updated OS_MCA handler which try to do recovery
# from multibit-ECC/poisoned memory-read error on user-land.
# (Thank you very much for comments, Keith and Grant!)
#
# I'd still appreciate it if anyone having good test environment
# could apply my patch and could report how it works.
# (especially reports on non-Tiger/non-Intel platform are welcome.)
#
# Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
# Signed-off-by: Tony Luck <tony.luck@intel.com>
#
# arch/ia64/kernel/mca_drv_asm.S
# 2004/09/15 18:18:04+00:00 aegl@agluck-lia64.sc.intel.com +45 -0
# MCA 2xECC memory errors
#
# arch/ia64/kernel/mca_drv.h
# 2004/09/15 18:18:04+00:00 aegl@agluck-lia64.sc.intel.com +113 -0
# MCA 2xECC memory errors
#
# arch/ia64/kernel/mca_drv_asm.S
# 2004/09/15 18:18:04+00:00 aegl@agluck-lia64.sc.intel.com +0 -0
# BitKeeper file /data/home/aegl/BK/work/seto2/arch/ia64/kernel/mca_drv_asm.S
#
# arch/ia64/kernel/mca_drv.h
# 2004/09/15 18:18:04+00:00 aegl@agluck-lia64.sc.intel.com +0 -0
# BitKeeper file /data/home/aegl/BK/work/seto2/arch/ia64/kernel/mca_drv.h
#
# arch/ia64/kernel/mca_drv.c
# 2004/09/15 18:18:03+00:00 aegl@agluck-lia64.sc.intel.com +641 -0
# MCA 2xECC memory errors
#
# arch/ia64/kernel/mca_drv.c
# 2004/09/15 18:18:03+00:00 aegl@agluck-lia64.sc.intel.com +0 -0
# BitKeeper file /data/home/aegl/BK/work/seto2/arch/ia64/kernel/mca_drv.c
#
# include/asm-ia64/mca.h
# 2004/09/15 18:16:58+00:00 aegl@agluck-lia64.sc.intel.com +6 -0
# MCA 2xECC memory errors
#
# arch/ia64/kernel/mca.c
# 2004/09/15 18:16:57+00:00 aegl@agluck-lia64.sc.intel.com +35 -6
# MCA 2xECC memory errors
#
# arch/ia64/kernel/Makefile
# 2004/09/15 18:16:57+00:00 aegl@agluck-lia64.sc.intel.com +2 -0
# MCA 2xECC memory errors
#
# arch/ia64/Kconfig
# 2004/09/15 18:16:57+00:00 aegl@agluck-lia64.sc.intel.com +3 -0
# MCA 2xECC memory errors
#
# ChangeSet
# 2004/09/15 18:08:25+00:00 aegl@agluck-lia64.sc.intel.com
# Merge agluck-lia64.sc.intel.com:/data/home/aegl/BK/Linus
# into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-test-2.6.9
#
# kernel/posix-timers.c
# 2004/09/15 18:08:19+00:00 aegl@agluck-lia64.sc.intel.com +0 -0
# Auto merged
#
# drivers/char/hpet.c
# 2004/09/15 18:08:18+00:00 aegl@agluck-lia64.sc.intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/09/09 23:19:44+00:00 aegl@agluck-lia64.sc.intel.com
# Merge agluck-lia64.sc.intel.com:/data/home/aegl/BK/Linus
# into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-test-2.6.9
#
# arch/ia64/pci/pci.c
# 2004/09/09 23:19:38+00:00 aegl@agluck-lia64.sc.intel.com +0 -0
# Auto merged
#
# arch/ia64/mm/discontig.c
# 2004/09/09 23:19:38+00:00 aegl@agluck-lia64.sc.intel.com +0 -0
# Auto merged
#
# arch/ia64/kernel/acpi.c
# 2004/09/09 23:19:38+00:00 aegl@agluck-lia64.sc.intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/09/09 23:17:38+00:00 aegl@agluck-lia64.sc.intel.com
# Merge agluck-lia64.sc.intel.com:/data/home/aegl/BK/work/alex
# into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-test-2.6.9
#
# arch/ia64/pci/pci.c
# 2004/09/09 23:17:32+00:00 aegl@agluck-lia64.sc.intel.com +0 -0
# Auto merged
#
# arch/ia64/mm/discontig.c
# 2004/09/09 23:17:32+00:00 aegl@agluck-lia64.sc.intel.com +0 -0
# Auto merged
#
# arch/ia64/kernel/acpi.c
# 2004/09/09 23:17:32+00:00 aegl@agluck-lia64.sc.intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/09/08 18:06:50+00:00 aegl@agluck-lia64.sc.intel.com
# Merge with Linux latest
#
# kernel/timer.c
# 2004/09/08 18:06:42+00:00 aegl@agluck-lia64.sc.intel.com +1 -10
# Merge with Linux latest
#
# kernel/posix-timers.c
# 2004/09/08 18:06:42+00:00 aegl@agluck-lia64.sc.intel.com +0 -5
# Merge with Linux latest
#
# include/linux/timex.h
# 2004/09/08 18:06:42+00:00 aegl@agluck-lia64.sc.intel.com +2 -44
# Merge with Linux latest
#
# arch/ia64/kernel/time.c
# 2004/09/08 18:06:42+00:00 aegl@agluck-lia64.sc.intel.com +0 -28
# Merge with Linux latest
#
# ChangeSet
# 2004/09/08 18:05:16+00:00 aegl@agluck-lia64.sc.intel.com
# Merge with Linus latest
#
# include/asm-ia64/acpi.h
# 2004/09/08 17:45:07+00:00 aegl@agluck-lia64.sc.intel.com +0 -0
# Auto merged
#
# drivers/char/hpet.c
# 2004/09/08 17:45:07+00:00 aegl@agluck-lia64.sc.intel.com +0 -3
# Auto merged
#
# arch/ia64/sn/kernel/sn2/timer.c
# 2004/09/08 17:45:06+00:00 aegl@agluck-lia64.sc.intel.com +0 -4
# Auto merged
#
# arch/ia64/kernel/perfmon.c
# 2004/09/08 17:45:06+00:00 aegl@agluck-lia64.sc.intel.com +0 -0
# Auto merged
#
# arch/ia64/kernel/fsys.S
# 2004/09/08 17:45:06+00:00 aegl@agluck-lia64.sc.intel.com +0 -185
# Auto merged
#
# arch/ia64/kernel/cyclone.c
# 2004/09/08 17:45:06+00:00 aegl@agluck-lia64.sc.intel.com +0 -4
# Auto merged
#
# arch/ia64/kernel/asm-offsets.c
# 2004/09/08 17:45:06+00:00 aegl@agluck-lia64.sc.intel.com +0 -16
# Auto merged
#
# arch/ia64/configs/sn2_defconfig
# 2004/09/08 17:45:05+00:00 aegl@agluck-lia64.sc.intel.com +0 -0
# Auto merged
#
# arch/ia64/configs/generic_defconfig
# 2004/09/08 17:45:05+00:00 aegl@agluck-lia64.sc.intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/08/30 22:23:36+00:00 aegl@agluck-lia64.sc.intel.com
# Merge agluck-lia64.sc.intel.com:/data/home/aegl/BK/work/eranian
# into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-test-2.6.9
#
# arch/ia64/kernel/perfmon.c
# 2004/08/30 22:23:31+00:00 aegl@agluck-lia64.sc.intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/08/30 21:16:20+00:00 aegl@agluck-lia64.sc.intel.com
# Merge agluck-lia64.sc.intel.com:/data/home/aegl/BK/work/sn2defconfig
# into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-test-2.6.9
#
# arch/ia64/configs/sn2_defconfig
# 2004/08/30 21:16:15+00:00 aegl@agluck-lia64.sc.intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/08/25 23:16:36+00:00 aegl@agluck-lia64.sc.intel.com
# Merge agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-test-2.6.8.1
# into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-test-2.6.9
#
# arch/ia64/configs/generic_defconfig
# 2004/08/25 23:16:31+00:00 aegl@agluck-lia64.sc.intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/08/24 22:21:59+00:00 aegl@agluck-lia64.sc.intel.com
# Merge agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-test-2.6.8.1
# into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-test-2.6.9
#
# kernel/timer.c
# 2004/08/24 22:21:54+00:00 aegl@agluck-lia64.sc.intel.com +0 -0
# Auto merged
#
# kernel/posix-timers.c
# 2004/08/24 22:21:53+00:00 aegl@agluck-lia64.sc.intel.com +0 -0
# Auto merged
#
# include/asm-ia64/acpi.h
# 2004/08/24 22:21:53+00:00 aegl@agluck-lia64.sc.intel.com +0 -1
# Auto merged
#
# ChangeSet
# 2004/08/24 21:26:27+00:00 clameter@sgi.com
# scalability & performance improvements for timers
#
# Signed-off-by: Christoph Lameter <clameter@sgi.com>
# Signed-off-by: Tony Luck <tony.luck@intel.com>
#
# - Include corrected test data since the test program had a bad
# influence on the outcome. Scalability is better than the
# test program indicated.
# - Correctly setup the timer accuracy.
# - Consistently increases performance over existing codebase
# - Make the IA64 fastcall work for all clock sources and not only
# for ITC based clocking.
# - Add fastcall for clock_gettime(REALTIME and MONOTONIC)
# (the fastcall also returns nanoseconds instead of usecs*1000)
# - Scalability improvements in particular for the use of global clocks
# by avoiding the use of a cmpxchg. For applications
# that continually "live" in gettimeofday on an SMP system this
# will be a significant improvement.
# - Ability to switch off the cmpxchg for ITC based systems through
# a "nojitter" option on the kernel command line. This increases
# scalability of the time functions significantly. The ITC tuning code
# that runs during bootup typically insures that ITC offsets are less
# than a few cycles which are longer than the delay caused by the gettime
# functions and therefore the cmpxchg is not necessary on most systems.
# - Self tuning interpolator limiting the jumps forward to 10-20 usecs
# on each occurrence and increasing accuracy as well as robustness.
# There is no danger anymore that the interpolator is configured to
# be running too fast.
# - Report the increased accuracy via clock_getres() to userspace.
# - Generic interface. An interpolator can be easily setup by simply
# setting up a time_interpolator structure with some values.
# No coding of special functions needed.
# - Supports the HPET timer.
#
# kernel/timer.c
# 2004/08/24 21:20:31+00:00 aegl@agluck-lia64.sc.intel.com +10 -5
# scalability & performance improvements for timers
#
# kernel/posix-timers.c
# 2004/08/24 21:20:31+00:00 aegl@agluck-lia64.sc.intel.com +5 -0
# scalability & performance improvements for timers
#
# include/linux/timex.h
# 2004/08/24 21:20:31+00:00 aegl@agluck-lia64.sc.intel.com +123 -52
# scalability & performance improvements for timers
#
# drivers/char/hpet.c
# 2004/08/24 21:20:31+00:00 aegl@agluck-lia64.sc.intel.com +3 -33
# scalability & performance improvements for timers
#
# arch/ia64/sn/kernel/sn2/timer.c
# 2004/08/24 21:20:31+00:00 aegl@agluck-lia64.sc.intel.com +4 -45
# scalability & performance improvements for timers
#
# arch/ia64/kernel/time.c
# 2004/08/24 21:20:31+00:00 aegl@agluck-lia64.sc.intel.com +35 -84
# scalability & performance improvements for timers
#
# arch/ia64/kernel/fsys.S
# 2004/08/24 21:20:31+00:00 aegl@agluck-lia64.sc.intel.com +185 -172
# scalability & performance improvements for timers
#
# arch/ia64/kernel/cyclone.c
# 2004/08/24 21:20:31+00:00 aegl@agluck-lia64.sc.intel.com +4 -55
# scalability & performance improvements for timers
#
# arch/ia64/kernel/asm-offsets.c
# 2004/08/24 21:20:31+00:00 aegl@agluck-lia64.sc.intel.com +16 -3
# scalability & performance improvements for timers
#
# ChangeSet
# 2004/08/24 16:16:47+00:00 aegl@agluck-lia64.sc.intel.com
# Merge agluck-lia64.sc.intel.com:/data/home/aegl/BK/Linus
# into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-test-2.6.9
#
# include/asm-ia64/acpi.h
# 2004/08/24 16:16:42+00:00 aegl@agluck-lia64.sc.intel.com +0 -1
# Auto merged
#
# ChangeSet
# 2004/08/17 23:50:42+00:00 aegl@agluck-lia64.sc.intel.com
# Merge agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-test-2.6.8.1
# into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-test-2.6.9
#
# include/asm-ia64/acpi.h
# 2004/08/17 23:50:37+00:00 aegl@agluck-lia64.sc.intel.com +0 -0
# Auto merged
#
diff -Nru a/arch/ia64/Kconfig b/arch/ia64/Kconfig
--- a/arch/ia64/Kconfig 2004-10-01 19:37:37 -07:00
+++ b/arch/ia64/Kconfig 2004-10-01 19:37:37 -07:00
@@ -283,6 +283,9 @@
config IA64_MCA_RECOVERY
tristate "MCA recovery from errors other than TLB."
+config IA64_MCA_RECOVERY
+ tristate "MCA recovery from errors other than TLB."
+
config PERFMON
bool "Performance monitor support"
help