tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

Linus Torvalds 96fad28a 3334c39f

+12 -9
+3 -3
arch/ia64/kernel/entry.S
··· 1574 1574 data8 sys_ioprio_set 1575 1575 data8 sys_ioprio_get // 1275 1576 1576 data8 sys_set_zone_reclaim 1577 - data8 sys_ni_syscall 1578 - data8 sys_ni_syscall 1579 - data8 sys_ni_syscall 1577 + data8 sys_inotify_init 1578 + data8 sys_inotify_add_watch 1579 + data8 sys_inotify_rm_watch 1580 1580 1581 1581 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls
+6 -6
arch/ia64/kernel/unwind.c
··· 362 362 if (info->pri_unat_loc) 363 363 nat_addr = info->pri_unat_loc; 364 364 else 365 - nat_addr = &info->sw->ar_unat; 365 + nat_addr = &info->sw->caller_unat; 366 366 nat_mask = (1UL << ((long) addr & 0x1f8)/8); 367 367 } 368 368 } else { ··· 524 524 case UNW_AR_UNAT: 525 525 addr = info->unat_loc; 526 526 if (!addr) 527 - addr = &info->sw->ar_unat; 527 + addr = &info->sw->caller_unat; 528 528 break; 529 529 530 530 case UNW_AR_LC: ··· 1775 1775 1776 1776 case UNW_INSN_SETNAT_MEMSTK: 1777 1777 if (!state->pri_unat_loc) 1778 - state->pri_unat_loc = &state->sw->ar_unat; 1778 + state->pri_unat_loc = &state->sw->caller_unat; 1779 1779 /* register off. is a multiple of 8, so the least 3 bits (type) are 0 */ 1780 1780 s[dst+1] = ((unsigned long) state->pri_unat_loc - s[dst]) | UNW_NAT_MEMSTK; 1781 1781 break; ··· 2243 2243 if (8*sizeof(unw_hash_index_t) < UNW_LOG_HASH_SIZE) 2244 2244 unw_hash_index_t_is_too_narrow(); 2245 2245 2246 - unw.sw_off[unw.preg_index[UNW_REG_PRI_UNAT_GR]] = SW(AR_UNAT); 2246 + unw.sw_off[unw.preg_index[UNW_REG_PRI_UNAT_GR]] = SW(CALLER_UNAT); 2247 2247 unw.sw_off[unw.preg_index[UNW_REG_BSPSTORE]] = SW(AR_BSPSTORE); 2248 - unw.sw_off[unw.preg_index[UNW_REG_PFS]] = SW(AR_UNAT); 2248 + unw.sw_off[unw.preg_index[UNW_REG_PFS]] = SW(AR_PFS); 2249 2249 unw.sw_off[unw.preg_index[UNW_REG_RP]] = SW(B0); 2250 - unw.sw_off[unw.preg_index[UNW_REG_UNAT]] = SW(AR_UNAT); 2250 + unw.sw_off[unw.preg_index[UNW_REG_UNAT]] = SW(CALLER_UNAT); 2251 2251 unw.sw_off[unw.preg_index[UNW_REG_PR]] = SW(PR); 2252 2252 unw.sw_off[unw.preg_index[UNW_REG_LC]] = SW(AR_LC); 2253 2253 unw.sw_off[unw.preg_index[UNW_REG_FPSR]] = SW(AR_FPSR);
+3
include/asm-ia64/unistd.h
··· 266 266 #define __NR_ioprio_set 1274 267 267 #define __NR_ioprio_get 1275 268 268 #define __NR_set_zone_reclaim 1276 269 + #define __NR_inotify_init 1277 270 + #define __NR_inotify_add_watch 1278 271 + #define __NR_inotify_rm_watch 1279 269 272 270 273 #ifdef __KERNEL__ 271 274