Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96fad28a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 3334c39f b833961b

arch/ia64/kernel/entry.S

+3 −3
Original line number Diff line number Diff line
@@ -1574,8 +1574,8 @@ sys_call_table: 
	data8 sys_ioprio_set

	data8 sys_ioprio_get			// 1275

	data8 sys_set_zone_reclaim

	data8 sys_ni_syscall

	data8 sys_ni_syscall

	data8 sys_ni_syscall

	data8 sys_inotify_init

	data8 sys_inotify_add_watch

	data8 sys_inotify_rm_watch



	.org sys_call_table + 8*NR_syscalls	// guard against failures to increase NR_syscalls

arch/ia64/kernel/unwind.c

+6 −6
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ unw_access_gr (struct unw_frame_info *info, int regnum, unsigned long *val, char 
			if (info->pri_unat_loc)

				nat_addr = info->pri_unat_loc;

			else

				nat_addr = &info->sw->ar_unat;

				nat_addr = &info->sw->caller_unat;

			nat_mask = (1UL << ((long) addr & 0x1f8)/8);

		}

	} else {
@@ -524,7 +524,7 @@ unw_access_ar (struct unw_frame_info *info, int regnum, unsigned long *val, int 
	      case UNW_AR_UNAT:

		addr = info->unat_loc;

		if (!addr)

			addr = &info->sw->ar_unat;

			addr = &info->sw->caller_unat;

		break;



	      case UNW_AR_LC:
@@ -1775,7 +1775,7 @@ run_script (struct unw_script *script, struct unw_frame_info *state) 


		      case UNW_INSN_SETNAT_MEMSTK:

			if (!state->pri_unat_loc)

				state->pri_unat_loc = &state->sw->ar_unat;

				state->pri_unat_loc = &state->sw->caller_unat;

			/* register off. is a multiple of 8, so the least 3 bits (type) are 0 */

			s[dst+1] = ((unsigned long) state->pri_unat_loc - s[dst]) | UNW_NAT_MEMSTK;

			break;
@@ -2243,11 +2243,11 @@ unw_init (void) 
	if (8*sizeof(unw_hash_index_t) < UNW_LOG_HASH_SIZE)

		unw_hash_index_t_is_too_narrow();



	unw.sw_off[unw.preg_index[UNW_REG_PRI_UNAT_GR]] = SW(AR_UNAT);

	unw.sw_off[unw.preg_index[UNW_REG_PRI_UNAT_GR]] = SW(CALLER_UNAT);

	unw.sw_off[unw.preg_index[UNW_REG_BSPSTORE]] = SW(AR_BSPSTORE);

	unw.sw_off[unw.preg_index[UNW_REG_PFS]] = SW(AR_UNAT);

	unw.sw_off[unw.preg_index[UNW_REG_PFS]] = SW(AR_PFS);

	unw.sw_off[unw.preg_index[UNW_REG_RP]] = SW(B0);

	unw.sw_off[unw.preg_index[UNW_REG_UNAT]] = SW(AR_UNAT);

	unw.sw_off[unw.preg_index[UNW_REG_UNAT]] = SW(CALLER_UNAT);

	unw.sw_off[unw.preg_index[UNW_REG_PR]] = SW(PR);

	unw.sw_off[unw.preg_index[UNW_REG_LC]] = SW(AR_LC);

	unw.sw_off[unw.preg_index[UNW_REG_FPSR]] = SW(AR_FPSR);

include/asm-ia64/unistd.h

+3 −0
Original line number Diff line number Diff line
@@ -266,6 +266,9 @@ 
#define __NR_ioprio_set			1274

#define __NR_ioprio_get			1275

#define __NR_set_zone_reclaim		1276

#define __NR_inotify_init		1277

#define __NR_inotify_add_watch		1278

#define __NR_inotify_rm_watch		1279



#ifdef __KERNEL__