Commit 5778077d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 asm changes from Ingo Molnar:
 "The biggest changes in this cycle were:

   - Revamp, simplify (and in some cases fix) Time Stamp Counter (TSC)
     primitives.  (Andy Lutomirski)

   - Add new, comprehensible entry and exit handlers written in C.
     (Andy Lutomirski)

   - vm86 mode cleanups and fixes.  (Brian Gerst)

   - 32-bit compat code cleanups.  (Brian Gerst)

  The amount of simplification in low level assembly code is already
  palpable:

     arch/x86/entry/entry_32.S                          | 130 +----
     arch/x86/entry/entry_64.S                          | 197 ++-----

  but more simplifications are planned.

  There's also the usual laudry mix of low level changes - see the
  changelog for details"

* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (83 commits)
  x86/asm: Drop repeated macro of X86_EFLAGS_AC definition
  x86/asm/msr: Make wrmsrl() a function
  x86/asm/delay: Introduce an MWAITX-based delay with a configurable timer
  x86/asm: Add MONITORX/MWAITX instruction support
  x86/traps: Weaken context tracking entry assertions
  x86/asm/tsc: Add rdtscll() merge helper
  selftests/x86: Add syscall_nt selftest
  selftests/x86: Disable sigreturn_64
  x86/vdso: Emit a GNU hash
  x86/entry: Remove do_notify_resume(), syscall_trace_leave(), and their TIF masks
  x86/entry/32: Migrate to C exit path
  x86/entry/32: Remove 32-bit syscall audit optimizations
  x86/vm86: Rename vm86->v86flags and v86mask
  x86/vm86: Rename vm86->vm86_info to user_vm86
  x86/vm86: Clean up vm86.h includes
  x86/vm86: Move the vm86 IRQ definitions to vm86.h
  x86/vm86: Use the normal pt_regs area for vm86
  x86/vm86: Eliminate 'struct kernel_vm86_struct'
  x86/vm86: Move fields from 'struct kernel_vm86_struct' to 'struct vm86'
  x86/vm86: Move vm86 fields out of 'thread_struct'
  ...
parents 65a99597 7e01ebff

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE