Skip to content

L
linux
Commit 57656b79 authored by Anton Blanchard's avatar Anton Blanchard
Browse files
Options

ppc64: fix NR_syscalls slip up

parent 4d54d1dd
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
arch/ppc64/kernel/irq.c
View file @ 57656b79
...@@ -695,7 +695,7 @@ static void register_irq_proc (unsigned int irq) ...@@ -695,7 +695,7 @@ static void register_irq_proc (unsigned int irq)
struct proc_dir_entry *entry; struct proc_dir_entry *entry;
char name [MAX_NAMELEN]; char name [MAX_NAMELEN];
if (!root_irq_dir || (irq_desc[irq].handler == NULL)) if (!root_irq_dir || (irq_desc[irq].handler == NULL) || irq_dir[irq])
return; return;
memset(name, 0, MAX_NAMELEN); memset(name, 0, MAX_NAMELEN);
......
arch/ppc64/kernel/misc.S
View file @ 57656b79
...@@ -737,7 +737,7 @@ _GLOBAL(sys_call_table32) ...@@ -737,7 +737,7 @@ _GLOBAL(sys_call_table32)
.llong .sys_set_tid_address .llong .sys_set_tid_address
.llong .ppc32_fadvise64 .llong .ppc32_fadvise64
.llong .sys_exit_group .llong .sys_exit_group
.llong .ppc32_lookup_dcookie /* 245 */ .llong .ppc32_lookup_dcookie /* 235 */
.llong .sys_epoll_create .llong .sys_epoll_create
.llong .sys_epoll_ctl .llong .sys_epoll_ctl
.llong .sys_epoll_wait .llong .sys_epoll_wait
......
include/asm-ppc64/unistd.h
View file @ 57656b79
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
#define __NR_clock_getres 247 #define __NR_clock_getres 247
#define __NR_clock_nanosleep 248 #define __NR_clock_nanosleep 248
#define __NR_syscalls 249 #define __NR_syscalls 239
#ifdef __KERNEL__ #ifdef __KERNEL__
#define NR_syscalls __NR_syscalls #define NR_syscalls __NR_syscalls
#endif #endif
......
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