diff options
| author | Richard Henderson <rth@kanga.twiddle.net> | 2003-07-12 22:57:25 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@kanga.twiddle.net> | 2003-07-12 22:57:25 -0700 |
| commit | daccbc604fbb9519b9259079f8f1840409a2fb5c (patch) | |
| tree | c21d2ee14a3cd69882a99830e356ec17636cf264 | |
| parent | 5fa458f64643c45c940aaba8e13f913c655dccda (diff) | |
| parent | 7b30618fce7a8321aec4de709a8e193364a593da (diff) | |
Merge kanga.twiddle.net:/home/rth/work/linux/linus-2.5
into kanga.twiddle.net:/home/rth/work/linux/axp-2.5
| -rw-r--r-- | arch/alpha/kernel/systbls.S | 1 | ||||
| -rw-r--r-- | include/asm-alpha/timex.h | 4 | ||||
| -rw-r--r-- | include/asm-alpha/unistd.h | 3 |
3 files changed, 6 insertions, 2 deletions
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__) |