Home Home > GIT Browse > vanilla
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.osdl.org>2003-07-13 05:53:17 -0700
committerLinus Torvalds <torvalds@home.osdl.org>2003-07-13 05:53:17 -0700
commitab359933e1652e6e6ef6f6418b2bf3b5f3313880 (patch)
treea157ac5b73d42f52d7fa48456681d421a7a6f26a
parent577700647d7cea853bdd0d3654637399a368a2cc (diff)
parentf3596aae38f06b98f76951df36a4111df25fc6d5 (diff)
Merge bk://are.twiddle.net/axp-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
-rw-r--r--arch/alpha/Kconfig11
-rw-r--r--arch/alpha/kernel/systbls.S1
-rw-r--r--include/asm-alpha/timex.h4
-rw-r--r--include/asm-alpha/unistd.h3
4 files changed, 6 insertions, 13 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 3d9ec6a852fe..058f7bbec918 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -269,17 +269,6 @@ config ISA
(MCA) or VESA. ISA is an older system, now being displaced by PCI;
newer boards don't support it. If you have ISA, say Y, otherwise N.
-config SBUS
- bool
-
-config MCA
- bool
- help
- MicroChannel Architecture is found in some IBM PS/2 machines and
- laptops. It is a bus system similar to PCI or ISA. See
- <file:Documentation/mca.txt> (and especially the web page given
- there) before attempting to build an MCA bus kernel.
-
config PCI
bool
depends on !ALPHA_JENSEN
diff --git a/arch/alpha/kernel/systbls.S b/arch/alpha/kernel/systbls.S
index 3d9d1ac4f830..64f6da6300d4 100644
--- a/arch/alpha/kernel/systbls.S
+++ b/arch/alpha/kernel/systbls.S
@@ -443,6 +443,7 @@ sys_call_table:
.quad sys_clock_getres
.quad sys_clock_nanosleep
.quad sys_semtimedop
+ .quad sys_tgkill
.size sys_call_table, . - sys_call_table
.type sys_call_table, @object
diff --git a/include/asm-alpha/timex.h b/include/asm-alpha/timex.h
index 2576553b348e..f3737a1ee698 100644
--- a/include/asm-alpha/timex.h
+++ b/include/asm-alpha/timex.h
@@ -6,7 +6,9 @@
#ifndef _ASMALPHA_TIMEX_H
#define _ASMALPHA_TIMEX_H
-#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */
+/* With only one or two oddballs, we use the RTC as the ticker, selecting
+ the 32.768kHz reference clock, which nicely divides down to our HZ. */
+#define CLOCK_TICK_RATE 32768
/*
* Standard way to access the cycle counter.
diff --git a/include/asm-alpha/unistd.h b/include/asm-alpha/unistd.h
index 38faced4d0a2..3035b700f454 100644
--- a/include/asm-alpha/unistd.h
+++ b/include/asm-alpha/unistd.h
@@ -359,7 +359,8 @@
#define __NR_clock_getres 421
#define __NR_clock_nanosleep 422
#define __NR_semtimedop 423
-#define NR_SYSCALLS 424
+#define __NR_tgkill 424
+#define NR_SYSCALLS 425
#if defined(__GNUC__)