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

Commit c5014de8 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master'

parents cc9278ed 5bc159e6

arch/ia64/ia32/ia32_signal.c

+1 −0
Original line number Diff line number Diff line
@@ -515,6 +515,7 @@ sys32_signal (int sig, unsigned int handler) 


	sigact_set_handler(&new_sa, handler, 0);

	new_sa.sa.sa_flags = SA_ONESHOT | SA_NOMASK;

	sigemptyset(&new_sa.sa.sa_mask);



	ret = do_sigaction(sig, &new_sa, &old_sa);

arch/ia64/kernel/entry.S

+16 −0
Original line number Diff line number Diff line
@@ -1601,5 +1601,21 @@ sys_call_table: 
	data8 sys_inotify_add_watch

	data8 sys_inotify_rm_watch

	data8 sys_migrate_pages			// 1280

	data8 sys_openat

	data8 sys_mkdirat

	data8 sys_mknodat

	data8 sys_fchownat

	data8 sys_futimesat			// 1285

	data8 sys_newfstatat

	data8 sys_unlinkat

	data8 sys_renameat

	data8 sys_linkat

	data8 sys_symlinkat			// 1290

	data8 sys_readlinkat

	data8 sys_fchmodat

	data8 sys_faccessat

	data8 sys_ni_syscall			// reserved for pselect

	data8 sys_ni_syscall			// 1295 reserved for ppoll

	data8 sys_unshare



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

arch/ia64/kernel/fsys.S

+3 −26
Original line number Diff line number Diff line
@@ -878,31 +878,8 @@ fsyscall_table: 
	data8 0				// timer_delete

	data8 0				// clock_settime

	data8 fsys_clock_gettime	// clock_gettime

	data8 0				// clock_getres		// 1255

	data8 0				// clock_nanosleep

	data8 0				// fstatfs64

	data8 0				// statfs64

	data8 0

	data8 0							// 1260

	data8 0

	data8 0				// mq_open

	data8 0				// mq_unlink

	data8 0				// mq_timedsend

	data8 0				// mq_timedreceive	// 1265

	data8 0				// mq_notify

	data8 0				// mq_getsetattr

	data8 0				// kexec_load

	data8 0

	data8 0							// 1270

	data8 0

	data8 0

	data8 0

	data8 0

	data8 0							// 1275

	data8 0

	data8 0

	data8 0

	data8 0

	data8 0							// 1280

	#define __NR_syscall_last	1255



	.space 8*(NR_syscalls + 1024 - __NR_syscall_last), 0



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

arch/ia64/kernel/mca_drv.c

+3 −0
Original line number Diff line number Diff line
@@ -437,6 +437,9 @@ recover_from_read_error(slidx_table_t *slidx, 
	 *    the process not have any locks of kernel.

	 */



	/* Is minstate valid? */

	if (!peidx_bottom(peidx) || !(peidx_bottom(peidx)->valid.minstate))

		return 0;

	psr1 =(struct ia64_psr *)&(peidx_minstate_area(peidx)->pmsa_ipsr);



	/*

arch/ia64/sn/kernel/io_init.c

+4 −4
Original line number Diff line number Diff line
@@ -617,15 +617,15 @@ void sn_bus_store_sysdata(struct pci_dev *dev) 
void sn_bus_free_sysdata(void)

{

	struct sysdata_el *element;

	struct list_head *list;

	struct list_head *list, *safe;



sn_sysdata_free_start:

	list_for_each(list, &sn_sysdata_list) {

	list_for_each_safe(list, safe, &sn_sysdata_list) {

		element = list_entry(list, struct sysdata_el, entry);

		list_del(&element->entry);

		list_del(&(((struct pcidev_info *)

			     (element->sysdata))->pdi_list));

		kfree(element->sysdata);

		kfree(element);

		goto sn_sysdata_free_start;

	}

	return;

}