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

Commit f587fb74 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'from-linus' into upstream

parents df8ccb9b 705af309

Makefile

+2 −2
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 17

EXTRAVERSION =-rc4

NAME=Sliding Snow Leopard

EXTRAVERSION =-rc5

NAME=Lordi Rules



# *DOCUMENTATION*

# To see a list of typical targets execute "make help"

arch/i386/power/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ void __restore_processor_state(struct saved_context *ctxt) 
	write_cr4(ctxt->cr4);

	write_cr3(ctxt->cr3);

	write_cr2(ctxt->cr2);

	write_cr2(ctxt->cr0);

	write_cr0(ctxt->cr0);



	/*

	 * now restore the descriptor tables to their proper values

arch/powerpc/kernel/systbl.S

+2 −0
Original line number Diff line number Diff line
@@ -338,6 +338,8 @@ SYSCALL(symlinkat) 
SYSCALL(readlinkat)

SYSCALL(fchmodat)

SYSCALL(faccessat)

COMPAT_SYS(get_robust_list)

COMPAT_SYS(set_robust_list)



/*

 * please add new calls to arch/powerpc/platforms/cell/spu_callbacks.c

arch/powerpc/platforms/cell/spu_callbacks.c

+5 −2
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ void *spu_syscall_table[] = { 
	[__NR_futex]			sys_futex,

	[__NR_sched_setaffinity]	sys_sched_setaffinity,

	[__NR_sched_getaffinity]	sys_sched_getaffinity,

	[224]				sys_ni_syscall,

	[__NR_tuxcall]			sys_ni_syscall,

	[226]				sys_ni_syscall,

	[__NR_io_setup]			sys_io_setup,
@@ -332,19 +333,21 @@ void *spu_syscall_table[] = { 
	[__NR_readlinkat]		sys_readlinkat,

	[__NR_fchmodat]			sys_fchmodat,

	[__NR_faccessat]		sys_faccessat,

	[__NR_get_robust_list]		sys_get_robust_list,

	[__NR_set_robust_list]		sys_set_robust_list,

};



long spu_sys_callback(struct spu_syscall_block *s)

{

	long (*syscall)(u64 a1, u64 a2, u64 a3, u64 a4, u64 a5, u64 a6);



	syscall = spu_syscall_table[s->nr_ret];



	if (s->nr_ret >= ARRAY_SIZE(spu_syscall_table)) {

		pr_debug("%s: invalid syscall #%ld", __FUNCTION__, s->nr_ret);

		return -ENOSYS;

	}



	syscall = spu_syscall_table[s->nr_ret];



#ifdef DEBUG

	print_symbol(KERN_DEBUG "SPU-syscall %s:", (unsigned long)syscall);

	printk("syscall%ld(%lx, %lx, %lx, %lx, %lx, %lx)\n",

arch/s390/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static inline void stop_hz_timer(void) 
	next = next_timer_interrupt();

	do {

		seq = read_seqbegin_irqsave(&xtime_lock, flags);

		timer = (__u64 next) - (__u64 jiffies) + jiffies_64;

		timer = ((__u64) next) - ((__u64) jiffies) + jiffies_64;

	} while (read_seqretry_irqrestore(&xtime_lock, seq, flags));

	todval = -1ULL;

	/* Be careful about overflows. */