Commit daccbc60 authored by Richard Henderson's avatar Richard Henderson

Merge kanga.twiddle.net:/home/rth/work/linux/linus-2.5

into kanga.twiddle.net:/home/rth/work/linux/axp-2.5
parents 5fa458f6 7b30618f
...@@ -443,6 +443,7 @@ sys_call_table: ...@@ -443,6 +443,7 @@ sys_call_table:
.quad sys_clock_getres .quad sys_clock_getres
.quad sys_clock_nanosleep .quad sys_clock_nanosleep
.quad sys_semtimedop .quad sys_semtimedop
.quad sys_tgkill
.size sys_call_table, . - sys_call_table .size sys_call_table, . - sys_call_table
.type sys_call_table, @object .type sys_call_table, @object
......
...@@ -6,7 +6,9 @@ ...@@ -6,7 +6,9 @@
#ifndef _ASMALPHA_TIMEX_H #ifndef _ASMALPHA_TIMEX_H
#define _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. * Standard way to access the cycle counter.
......
...@@ -359,7 +359,8 @@ ...@@ -359,7 +359,8 @@
#define __NR_clock_getres 421 #define __NR_clock_getres 421
#define __NR_clock_nanosleep 422 #define __NR_clock_nanosleep 422
#define __NR_semtimedop 423 #define __NR_semtimedop 423
#define NR_SYSCALLS 424 #define __NR_tgkill 424
#define NR_SYSCALLS 425
#if defined(__GNUC__) #if defined(__GNUC__)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment