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

Commit f320ead7 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/asm' into locking/core 



Upcoming changes to static keys is interacting/conflicting with the following
pending TSC commits in tip:x86/asm:

  4ea1636b x86/asm/tsc: Rename native_read_tsc() to rdtsc()
  ...

So merge it into the locking tree to have a smoother resolution.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 76695af2 decd275e

arch/um/include/shared/kern_util.h

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ extern int kmalloc_ok; 
extern unsigned long alloc_stack(int order, int atomic);

extern void free_stack(unsigned long stack, int order);



extern int do_signal(void);

struct pt_regs;

extern void do_signal(struct pt_regs *regs);

extern void interrupt_end(void);

extern void relay_signal(int sig, struct siginfo *si, struct uml_pt_regs *regs);

arch/um/kernel/process.c

+4 −2
Original line number Diff line number Diff line
@@ -90,12 +90,14 @@ void *__switch_to(struct task_struct *from, struct task_struct *to) 


void interrupt_end(void)

{

	struct pt_regs *regs = &current->thread.regs;



	if (need_resched())

		schedule();

	if (test_thread_flag(TIF_SIGPENDING))

		do_signal();

		do_signal(regs);

	if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME))

		tracehook_notify_resume(&current->thread.regs);

		tracehook_notify_resume(regs);

}



void exit_thread(void)

arch/um/kernel/signal.c

+1 −7
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs) 
	signal_setup_done(err, ksig, singlestep);

}



static int kern_do_signal(struct pt_regs *regs)

void do_signal(struct pt_regs *regs)

{

	struct ksignal ksig;

	int handled_sig = 0;
@@ -110,10 +110,4 @@ static int kern_do_signal(struct pt_regs *regs) 
	 */

	if (!handled_sig)

		restore_saved_sigmask();

	return handled_sig;

}



int do_signal(void)

{

	return kern_do_signal(&current->thread.regs);

}

arch/um/kernel/tlb.c

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ void fix_range_common(struct mm_struct *mm, unsigned long start_addr, 
		/* We are under mmap_sem, release it such that current can terminate */

		up_write(&current->mm->mmap_sem);

		force_sig(SIGKILL, current);

		do_signal();

		do_signal(&current->thread.regs);

	}

}

arch/um/kernel/trap.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static void bad_segv(struct faultinfo fi, unsigned long ip) 
void fatal_sigsegv(void)

{

	force_sigsegv(SIGSEGV, current);

	do_signal();

	do_signal(&current->thread.regs);

	/*

	 * This is to tell gcc that we're not returning - do_signal

	 * can, in general, return, but in this case, it's not, since