Skip to content

L
linux
Commit 929958bb authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge nuts.ninka.net:/disk1/davem/BK/sparcwork-2.5 

into nuts.ninka.net:/disk1/davem/BK/sparc-2.5
parents db4cf641 723434dc
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 10 deletions
arch/sparc/kernel/entry.S
View file @ 929958bb
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#define curptr g6 #define curptr g6
#define NR_SYSCALLS 267 /* Each OS is different... */ #define NR_SYSCALLS 268 /* Each OS is different... */
/* These are just handy. */ /* These are just handy. */
#define _SV save %sp, -STACKFRAME_SZ, %sp #define _SV save %sp, -STACKFRAME_SZ, %sp
......
arch/sparc/kernel/systbls.S
View file @ 929958bb
...@@ -72,7 +72,7 @@ sys_call_table: ...@@ -72,7 +72,7 @@ sys_call_table:
/*250*/ .long sparc_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl /*250*/ .long sparc_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
/*255*/ .long sys_nis_syscall, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep /*255*/ .long sys_nis_syscall, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
/*260*/ .long sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun /*260*/ .long sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
/*265*/ .long sys_timer_delete, sys_timer_create, sys_nis_syscall /*265*/ .long sys_timer_delete, sys_timer_create, sys_nis_syscall, sys_nis_syscall
#ifdef CONFIG_SUNOS_EMUL #ifdef CONFIG_SUNOS_EMUL
/* Now the SunOS syscall table. */ /* Now the SunOS syscall table. */
...@@ -171,6 +171,6 @@ sunos_sys_table: ...@@ -171,6 +171,6 @@ sunos_sys_table:
.long sunos_nosys .long sunos_nosys
/*260*/ .long sunos_nosys, sunos_nosys, sunos_nosys /*260*/ .long sunos_nosys, sunos_nosys, sunos_nosys
.long sunos_nosys, sunos_nosys, sunos_nosys .long sunos_nosys, sunos_nosys, sunos_nosys
.long sunos_nosys, sunos_nosys .long sunos_nosys, sunos_nosys, sunos_nosys
#endif #endif
arch/sparc64/kernel/entry.S
View file @ 929958bb
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#define curptr g6 #define curptr g6
#define NR_SYSCALLS 267 /* Each OS is different... */ #define NR_SYSCALLS 268 /* Each OS is different... */
.text .text
.align 32 .align 32
......
arch/sparc64/kernel/systbls.S
View file @ 929958bb
...@@ -72,7 +72,7 @@ sys_call_table32: ...@@ -72,7 +72,7 @@ sys_call_table32:
/*250*/ .word sys32_mremap, sys32_sysctl, sys_getsid, sys_fdatasync, sys32_nfsservctl /*250*/ .word sys32_mremap, sys32_sysctl, sys_getsid, sys_fdatasync, sys32_nfsservctl
.word sys_ni_syscall, compat_clock_settime, compat_clock_gettime, compat_clock_getres, compat_clock_nanosleep .word sys_ni_syscall, compat_clock_settime, compat_clock_gettime, compat_clock_getres, compat_clock_nanosleep
/*260*/ .word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, compat_timer_settime, compat_timer_gettime, sys_timer_getoverrun /*260*/ .word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, compat_timer_settime, compat_timer_gettime, sys_timer_getoverrun
.word sys_timer_delete, sys32_timer_create, sys_ni_syscall .word sys_timer_delete, sys32_timer_create, sys_ni_syscall, sys_ni_syscall
/* Now the 64-bit native Linux syscall table. */ /* Now the 64-bit native Linux syscall table. */
...@@ -133,7 +133,7 @@ sys_call_table: ...@@ -133,7 +133,7 @@ sys_call_table:
/*250*/ .word sys64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl /*250*/ .word sys64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
.word sys_ni_syscall, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep .word sys_ni_syscall, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
/*260*/ .word sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun /*260*/ .word sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
.word sys_timer_delete, sys_timer_create, sys_ni_syscall .word sys_timer_delete, sys_timer_create, sys_ni_syscall, sys_ni_syscall
#if defined(CONFIG_SUNOS_EMUL) || defined(CONFIG_SOLARIS_EMUL) || \ #if defined(CONFIG_SUNOS_EMUL) || defined(CONFIG_SOLARIS_EMUL) || \
defined(CONFIG_SOLARIS_EMUL_MODULE) defined(CONFIG_SOLARIS_EMUL_MODULE)
...@@ -233,5 +233,6 @@ sunos_sys_table: ...@@ -233,5 +233,6 @@ sunos_sys_table:
.word sunos_nosys, sunos_nosys, sunos_nosys .word sunos_nosys, sunos_nosys, sunos_nosys
.word sunos_nosys, sunos_nosys, sunos_nosys .word sunos_nosys, sunos_nosys, sunos_nosys
.word sunos_nosys, sunos_nosys, sunos_nosys .word sunos_nosys, sunos_nosys, sunos_nosys
.word sunos_nosys
#endif #endif
drivers/sbus/char/bbc_envctrl.c
View file @ 929958bb
...@@ -59,7 +59,7 @@ static int errno; ...@@ -59,7 +59,7 @@ static int errno;
* before the hardware based power-off event is triggered. * before the hardware based power-off event is triggered.
*/ */
/* These settings are in celcius. We use these defaults only /* These settings are in Celsius. We use these defaults only
* if we cannot interrogate the cpu-fru SEEPROM. * if we cannot interrogate the cpu-fru SEEPROM.
*/ */
struct temp_limits { struct temp_limits {
......
drivers/sbus/char/cpwatchdog.c
View file @ 929958bb
...@@ -539,7 +539,7 @@ static void wd_toggleintr(struct wd_timer* pTimer, int enable) ...@@ -539,7 +539,7 @@ static void wd_toggleintr(struct wd_timer* pTimer, int enable)
static void wd_pingtimer(struct wd_timer* pTimer) static void wd_pingtimer(struct wd_timer* pTimer)
{ {
if(wd_readb(&pTimer->regs->status) & WD_S_RUNNING) { if(wd_readb(&pTimer->regs->status) & WD_S_RUNNING) {
wd_readb(&pTimer->regs->dcntr); wd_readw(&pTimer->regs->dcntr);
} }
} }
......
include/asm-sparc/unistd.h
View file @ 929958bb
...@@ -283,7 +283,8 @@ ...@@ -283,7 +283,8 @@
#define __NR_timer_getoverrun 264 #define __NR_timer_getoverrun 264
#define __NR_timer_delete 265 #define __NR_timer_delete 265
#define __NR_timer_create 266 #define __NR_timer_create 266
/* WARNING: You MAY NOT add syscall numbers larger than 266, since /* #define __NR_vserver 267 Reserved for VSERVER */
/* WARNING: You MAY NOT add syscall numbers larger than 267, since
* all of the syscall tables in the Sparc kernel are * all of the syscall tables in the Sparc kernel are
* sized to have 267 entries (starting at zero). Therefore * sized to have 267 entries (starting at zero). Therefore
* find a free slot in the 0-266 range. * find a free slot in the 0-266 range.
......
include/asm-sparc64/unistd.h
View file @ 929958bb
...@@ -285,7 +285,8 @@ ...@@ -285,7 +285,8 @@
#define __NR_timer_getoverrun 264 #define __NR_timer_getoverrun 264
#define __NR_timer_delete 265 #define __NR_timer_delete 265
#define __NR_timer_create 266 #define __NR_timer_create 266
/* WARNING: You MAY NOT add syscall numbers larger than 266, since /* #define __NR_vserver 267 Reserved for VSERVER */
/* WARNING: You MAY NOT add syscall numbers larger than 267, since
* all of the syscall tables in the Sparc kernel are * all of the syscall tables in the Sparc kernel are
* sized to have 267 entries (starting at zero). Therefore * sized to have 267 entries (starting at zero). Therefore
* find a free slot in the 0-266 range. * find a free slot in the 0-266 range.
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7