Commit bcd49c3d 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:
 "Various cleanups and simplifications, none of them really stands out,
  they are all over the place"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/uaccess: Remove unused __addr_ok() macro
  x86/smpboot: Remove unused phys_id variable
  x86/mm/dump_pagetables: Remove the unused prev_pud variable
  x86/fpu: Move init_xstate_size() to __init section
  x86/cpu_entry_area: Move percpu_setup_debug_store() to __init section
  x86/mtrr: Remove unused variable
  x86/boot/compressed/64: Explain paging_prepare()'s return value
  x86/resctrl: Remove duplicate MSR_MISC_FEATURE_CONTROL definition
  x86/asm/suspend: Drop ENTRY from local data
  x86/hw_breakpoints, kprobes: Remove kprobes ifdeffery
  x86/boot: Save several bytes in decompressor
  x86/trap: Remove useless declaration
  x86/mm/tlb: Remove unused cpu variable
  x86/events: Mark expected switch-case fall-throughs
  x86/asm-prototypes: Remove duplicate include <asm/page.h>
  x86/kernel: Mark expected switch-case fall-throughs
  x86/insn-eval: Mark expected switch-case fall-through
  x86/platform/UV: Replace kmalloc() and memset() with k[cz]alloc() calls
  x86/e820: Replace kmalloc() + memcpy() with kmemdup()
parents f14b5f05 2e7614c0

arch/x86/boot/compressed/head_64.S

+6 −5
Original line number Original line Diff line number Diff line
@@ -358,8 +358,11 @@ ENTRY(startup_64) 
	 * paging_prepare() sets up the trampoline and checks if we need to

	 * paging_prepare() sets up the trampoline and checks if we need to

	 * enable 5-level paging.

	 * enable 5-level paging.

	 *

	 *

	 * Address of the trampoline is returned in RAX.

	 * paging_prepare() returns a two-quadword structure which lands

	 * Non zero RDX on return means we need to enable 5-level paging.

	 * into RDX:RAX:

	 *   - Address of the trampoline is returned in RAX.

	 *   - Non zero RDX means trampoline needs to enable 5-level

	 *     paging.

	 *

	 *

	 * RSI holds real mode data and needs to be preserved across

	 * RSI holds real mode data and needs to be preserved across

	 * this function call.

	 * this function call.
@@ -565,7 +568,7 @@ adjust_got: 
 *

 *

 * RDI contains the return address (might be above 4G).

 * RDI contains the return address (might be above 4G).

 * ECX contains the base address of the trampoline memory.

 * ECX contains the base address of the trampoline memory.

 * Non zero RDX on return means we need to enable 5-level paging.

 * Non zero RDX means trampoline needs to enable 5-level paging.

 */

 */

ENTRY(trampoline_32bit_src)

ENTRY(trampoline_32bit_src)

	/* Set up data and stack segments */

	/* Set up data and stack segments */
@@ -655,8 +658,6 @@ no_longmode: 
	.data

	.data

gdt64:

gdt64:

	.word	gdt_end - gdt

	.word	gdt_end - gdt

	.long	0

	.word	0

	.quad   0

	.quad   0

gdt:

gdt:

	.word	gdt_end - gdt

	.word	gdt_end - gdt

arch/x86/events/intel/core.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -4220,6 +4220,8 @@ __init int intel_pmu_init(void) 




	case INTEL_FAM6_CORE2_MEROM:

	case INTEL_FAM6_CORE2_MEROM:

		x86_add_quirk(intel_clovertown_quirk);

		x86_add_quirk(intel_clovertown_quirk);

		/* fall through */



	case INTEL_FAM6_CORE2_MEROM_L:

	case INTEL_FAM6_CORE2_MEROM_L:

	case INTEL_FAM6_CORE2_PENRYN:

	case INTEL_FAM6_CORE2_PENRYN:

	case INTEL_FAM6_CORE2_DUNNINGTON:

	case INTEL_FAM6_CORE2_DUNNINGTON:

arch/x86/events/intel/lbr.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -931,6 +931,7 @@ static int branch_type(unsigned long from, unsigned long to, int abort) 
			ret = X86_BR_ZERO_CALL;

			ret = X86_BR_ZERO_CALL;

			break;

			break;

		}

		}

		/* fall through */

	case 0x9a: /* call far absolute */

	case 0x9a: /* call far absolute */

		ret = X86_BR_CALL;

		ret = X86_BR_CALL;

		break;

		break;

arch/x86/include/asm/asm-prototypes.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -7,7 +7,6 @@ 




#include <asm-generic/asm-prototypes.h>

#include <asm-generic/asm-prototypes.h>





#include <asm/page.h>

#include <asm/pgtable.h>

#include <asm/pgtable.h>

#include <asm/special_insns.h>

#include <asm/special_insns.h>

#include <asm/preempt.h>

#include <asm/preempt.h>

arch/x86/include/asm/processor.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -742,7 +742,6 @@ enum idle_boot_override {IDLE_NO_OVERRIDE=0, IDLE_HALT, IDLE_NOMWAIT, 
extern void enable_sep_cpu(void);

extern void enable_sep_cpu(void);

extern int sysenter_setup(void);

extern int sysenter_setup(void);





void early_trap_pf_init(void);





/* Defined in head.S */

/* Defined in head.S */

extern struct desc_ptr		early_gdt_descr;

extern struct desc_ptr		early_gdt_descr;

CRA Git | Maintained and supported by SUSTech CRA and CCSE