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

Commit 73c8e679 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

BenH says:
 'Here are a few more powerpc bits for you.  A stupid regression I
  introduced with my previous commit to "fix" program check exceptions
  (brown paper bag for me), fix the cpuidle default, a bug fix for
  something that isn't strictly speaking a regression but some upstream
  changes causes it to show in lockdep now while it didn't before, and
  finally a trivial one for rusty to make his life easier later on
  removing the old cpumask cruft. '

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Fix various issues with return to userspace
  cpuidle: Default y on powerpc pSeries
  powerpc: Fix program check handling when lockdep is enabled
  powerpc: Remove references to cpu_*_map
parents 0200971d 18b246fa

arch/powerpc/kernel/entry_32.S

+1 −1
Original line number Diff line number Diff line
@@ -1213,7 +1213,7 @@ do_user_signal: /* r10 contains MSR_KERNEL here */ 
	stw	r3,_TRAP(r1)

2:	addi	r3,r1,STACK_FRAME_OVERHEAD

	mr	r4,r9

	bl	do_signal

	bl	do_notify_resume

	REST_NVGPRS(r1)

	b	recheck

arch/powerpc/kernel/entry_64.S

+5 −1
Original line number Diff line number Diff line
@@ -751,12 +751,16 @@ user_work: 


	andi.	r0,r4,_TIF_NEED_RESCHED

	beq	1f

	li	r5,1

	TRACE_AND_RESTORE_IRQ(r5);

	bl	.schedule

	b	.ret_from_except_lite



1:	bl	.save_nvgprs

	li	r5,1

	TRACE_AND_RESTORE_IRQ(r5);

	addi	r3,r1,STACK_FRAME_OVERHEAD

	bl	.do_signal

	bl	.do_notify_resume

	b	.ret_from_except



unrecov_restore:

arch/powerpc/kernel/exceptions-64s.S

+1 −1
Original line number Diff line number Diff line
@@ -774,8 +774,8 @@ alignment_common: 
program_check_common:

	EXCEPTION_PROLOG_COMMON(0x700, PACA_EXGEN)

	bl	.save_nvgprs

	addi	r3,r1,STACK_FRAME_OVERHEAD

	DISABLE_INTS

	addi	r3,r1,STACK_FRAME_OVERHEAD

	bl	.program_check_exception

	b	.ret_from_except

arch/powerpc/kernel/signal.c

+8 −4
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#include <linux/tracehook.h>

#include <linux/signal.h>

#include <linux/key.h>

#include <asm/hw_breakpoint.h>

#include <asm/uaccess.h>

#include <asm/unistd.h>
@@ -113,8 +114,9 @@ static void check_syscall_restart(struct pt_regs *regs, struct k_sigaction *ka, 
	}

}



static int do_signal_pending(sigset_t *oldset, struct pt_regs *regs)

static int do_signal(struct pt_regs *regs)

{

	sigset_t *oldset;

	siginfo_t info;

	int signr;

	struct k_sigaction ka;
@@ -123,7 +125,7 @@ static int do_signal_pending(sigset_t *oldset, struct pt_regs *regs) 


	if (current_thread_info()->local_flags & _TLF_RESTORE_SIGMASK)

		oldset = &current->saved_sigmask;

	else if (!oldset)

	else

		oldset = &current->blocked;



	signr = get_signal_to_deliver(&info, &ka, regs, NULL);
@@ -191,14 +193,16 @@ static int do_signal_pending(sigset_t *oldset, struct pt_regs *regs) 
	return ret;

}



void do_signal(struct pt_regs *regs, unsigned long thread_info_flags)

void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags)

{

	if (thread_info_flags & _TIF_SIGPENDING)

		do_signal_pending(NULL, regs);

		do_signal(regs);



	if (thread_info_flags & _TIF_NOTIFY_RESUME) {

		clear_thread_flag(TIF_NOTIFY_RESUME);

		tracehook_notify_resume(regs);

		if (current->replacement_session_keyring)

			key_replace_session_keyring();

	}

}

arch/powerpc/kernel/signal.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))



extern void do_signal(struct pt_regs *regs, unsigned long thread_info_flags);

extern void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags);



extern void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,

				  size_t frame_size, int is_32);