diff options
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/kernel/entry.S | 2 | ||||
-rw-r--r-- | arch/ia64/kernel/process.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 66946f3fdac7..9be53e1ea404 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S | |||
@@ -1573,7 +1573,7 @@ sys_call_table: | |||
1573 | data8 sys_keyctl | 1573 | data8 sys_keyctl |
1574 | data8 sys_ioprio_set | 1574 | data8 sys_ioprio_set |
1575 | data8 sys_ioprio_get // 1275 | 1575 | data8 sys_ioprio_get // 1275 |
1576 | data8 sys_set_zone_reclaim | 1576 | data8 sys_ni_syscall |
1577 | data8 sys_inotify_init | 1577 | data8 sys_inotify_init |
1578 | data8 sys_inotify_add_watch | 1578 | data8 sys_inotify_add_watch |
1579 | data8 sys_inotify_rm_watch | 1579 | data8 sys_inotify_rm_watch |
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index 66e840609808..051e050359e4 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c | |||
@@ -179,7 +179,7 @@ static int can_do_pal_halt = 1; | |||
179 | 179 | ||
180 | static int __init nohalt_setup(char * str) | 180 | static int __init nohalt_setup(char * str) |
181 | { | 181 | { |
182 | pal_halt = 0; | 182 | pal_halt = can_do_pal_halt = 0; |
183 | return 1; | 183 | return 1; |
184 | } | 184 | } |
185 | __setup("nohalt", nohalt_setup); | 185 | __setup("nohalt", nohalt_setup); |