Commit fb7ba211 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge remote branch 'korg/drm-fixes' into drm-vmware-next 

necessary for some of the vmware fixes to be pushed in.

Conflicts:
	drivers/gpu/drm/drm_gem.c
	drivers/gpu/drm/i915/intel_fb.c
	include/drm/drmP.h
parents 9a170cae abb295f3

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -2677,6 +2677,8 @@ M: Guenter Roeck <guenter.roeck@ericsson.com> 
L:	lm-sensors@lm-sensors.org

W:	http://www.lm-sensors.org/

T:	quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/

T:	quilt kernel.org/pub/linux/kernel/people/groeck/linux-staging/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git

S:	Maintained

F:	Documentation/hwmon/

F:	drivers/hwmon/

arch/alpha/kernel/entry.S

+7 −4
Original line number Diff line number Diff line
@@ -73,8 +73,6 @@ 
	ldq	$20, HAE_REG($19);	\

	stq	$21, HAE_CACHE($19);	\

	stq	$21, 0($20);		\

	ldq	$0, 0($sp);		\

	ldq	$1, 8($sp);		\

99:;					\

	ldq	$19, 72($sp);		\

	ldq	$20, 80($sp);		\
@@ -316,7 +314,7 @@ ret_from_sys_call: 
	cmovne	$26, 0, $19		/* $19 = 0 => non-restartable */

	ldq	$0, SP_OFF($sp)

	and	$0, 8, $0

	beq	$0, restore_all

	beq	$0, ret_to_kernel

ret_to_user:

	/* Make sure need_resched and sigpending don't change between

		sampling and the rti.  */
@@ -329,6 +327,11 @@ restore_all: 
	RESTORE_ALL

	call_pal PAL_rti



ret_to_kernel:

	lda	$16, 7

	call_pal PAL_swpipl

	br restore_all



	.align 3

$syscall_error:

	/*
@@ -657,7 +660,7 @@ kernel_thread: 
	/* We don't actually care for a3 success widgetry in the kernel.

	   Not for positive errno values.  */

	stq	$0, 0($sp)		/* $0 */

	br	restore_all

	br	ret_to_kernel

.end kernel_thread



/*

arch/alpha/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ dump_elf_thread(elf_greg_t *dest, struct pt_regs *pt, struct thread_info *ti) 
	dest[27] = pt->r27;

	dest[28] = pt->r28;

	dest[29] = pt->gp;

	dest[30] = rdusp();

	dest[30] = ti == current_thread_info() ? rdusp() : ti->pcb.usp;

	dest[31] = pt->pc;



	/* Once upon a time this was the PS value.  Which is stupid

arch/m32r/include/asm/signal.h

+0 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ typedef struct sigaltstack { 
#undef __HAVE_ARCH_SIG_BITOPS



struct pt_regs;

extern int do_signal(struct pt_regs *regs, sigset_t *oldset);



#define ptrace_signal_deliver(regs, cookie)	do { } while (0)

arch/m32r/include/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -351,6 +351,7 @@ 
#define __ARCH_WANT_SYS_OLD_GETRLIMIT /*will be unused*/

#define __ARCH_WANT_SYS_OLDUMOUNT

#define __ARCH_WANT_SYS_RT_SIGACTION

#define __ARCH_WANT_SYS_RT_SIGSUSPEND



#define __IGNORE_lchown

#define __IGNORE_setuid