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

Commit 57935b26 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 cleanups from Ingo Molnar:
 "Misc x86 cleanups"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, reloc: Use xorl instead of xorq in relocate_kernel_64.S
  x86, cleanups: Remove extra tab in __flush_tlb_one()
  x86/mce: Remove check for CONFIG_X86_MCE_P4THERMAL
parents 5f16a8cf f037e416

arch/x86/kernel/apic/apic.c

+1 −1
Original line number Diff line number Diff line
@@ -2302,7 +2302,7 @@ static void lapic_resume(void) 
	apic_write(APIC_SPIV, apic_pm_state.apic_spiv);

	apic_write(APIC_LVT0, apic_pm_state.apic_lvt0);

	apic_write(APIC_LVT1, apic_pm_state.apic_lvt1);

#if defined(CONFIG_X86_MCE_P4THERMAL) || defined(CONFIG_X86_MCE_INTEL)

#if defined(CONFIG_X86_MCE_INTEL)

	if (maxlvt >= 5)

		apic_write(APIC_LVTTHMR, apic_pm_state.apic_thmr);

#endif

arch/x86/kernel/relocate_kernel_64.S

+17 −17
Original line number Diff line number Diff line
@@ -151,21 +151,21 @@ identity_mapped: 


	testq	%r11, %r11

	jnz 1f

	xorq	%rax, %rax

	xorq	%rbx, %rbx

	xorq    %rcx, %rcx

	xorq    %rdx, %rdx

	xorq    %rsi, %rsi

	xorq    %rdi, %rdi

	xorq    %rbp, %rbp

	xorq	%r8,  %r8

	xorq	%r9,  %r9

	xorq	%r10, %r10

	xorq	%r11, %r11

	xorq	%r12, %r12

	xorq	%r13, %r13

	xorq	%r14, %r14

	xorq	%r15, %r15

	xorl	%eax, %eax

	xorl	%ebx, %ebx

	xorl    %ecx, %ecx

	xorl    %edx, %edx

	xorl    %esi, %esi

	xorl    %edi, %edi

	xorl    %ebp, %ebp

	xorl	%r8d, %r8d

	xorl	%r9d, %r9d

	xorl	%r10d, %r10d

	xorl	%r11d, %r11d

	xorl	%r12d, %r12d

	xorl	%r13d, %r13d

	xorl	%r14d, %r14d

	xorl	%r15d, %r15d



	ret
@@ -212,8 +212,8 @@ virtual_mapped: 
	/* Do the copies */

swap_pages:

	movq	%rdi, %rcx 	/* Put the page_list in %rcx */

	xorq	%rdi, %rdi

	xorq	%rsi, %rsi

	xorl	%edi, %edi

	xorl	%esi, %esi

	jmp	1f



0:	/* top, read another word for the indirection page */

arch/x86/include/asm/tlbflush.h

+1 −1

File changed.

Contains only whitespace changes.