Commit ea5bc7b9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_cleanups_for_v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull misc x86 cleanups from Borislav Petkov:
 "Trivial cleanups and fixes all over the place"

* tag 'x86_cleanups_for_v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  MAINTAINERS: Remove me from IDE/ATAPI section
  x86/pat: Do not compile stubbed functions when X86_PAT is off
  x86/asm: Ensure asm/proto.h can be included stand-alone
  x86/platform/intel/quark: Fix incorrect kernel-doc comment syntax in files
  x86/msr: Make locally used functions static
  x86/cacheinfo: Remove unneeded dead-store initialization
  x86/process/64: Move cpu_current_top_of_stack out of TSS
  tools/turbostat: Unmark non-kernel-doc comment
  x86/syscalls: Fix -Wmissing-prototypes warnings from COND_SYSCALL()
  x86/fpu/math-emu: Fix function cast warning
  x86/msr: Fix wr/rdmsr_safe_regs_on_cpu() prototypes
  x86: Fix various typos in comments, take #2
  x86: Remove unusual Unicode characters from comments
  x86/kaslr: Return boolean values from a function returning bool
  x86: Fix various typos in comments
  x86/setup: Remove unused RESERVE_BRK_ARRAY()
  stacktrace: Move documentation for arch_stack_walk_reliable() to header
  x86: Remove duplicate TSC DEADLINE MSR definitions
parents 90e66ce9 df448cdf

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -8612,9 +8612,8 @@ F: drivers/ide/ 
F:	include/linux/ide.h









IDE/ATAPI DRIVERS









M:	Borislav Petkov <bp@alien8.de>









L:	linux-ide@vger.kernel.org









S:	Maintained









S:	Orphan









F:	Documentation/cdrom/ide-cd.rst









F:	drivers/ide/ide-cd*








































arch/s390/kernel/stacktrace.c



+0
−6






























Original line number
Diff line number
Diff line







@@ -24,12 +24,6 @@ void arch_stack_walk(stack_trace_consume_fn consume_entry, void *cookie,







	}









}



















/*









 * This function returns an error if it detects any unreliable features of the









 * stack.  Otherwise it guarantees that the stack trace is reliable.









 *









 * If the task is not 'current', the caller *must* ensure the task is inactive.









 */









int arch_stack_walk_reliable(stack_trace_consume_fn consume_entry,









			     void *cookie, struct task_struct *task)









{
































arch/x86/boot/compressed/efi_thunk_64.S



+1
−1






























Original line number
Diff line number
Diff line







@@ -5,7 +5,7 @@







 * Early support for invoking 32-bit EFI services from a 64-bit kernel.









 *









 * Because this thunking occurs before ExitBootServices() we have to









 * restore the firmware's 32-bit GDT before we make EFI serivce calls,









 * restore the firmware's 32-bit GDT before we make EFI service calls,









 * since the firmware's 32-bit IDT is still currently installed and it









 * needs to be able to service interrupts.









 *
































arch/x86/boot/compressed/head_64.S



+1
−1






























Original line number
Diff line number
Diff line







@@ -252,7 +252,7 @@ SYM_FUNC_START(startup_32)







	/*









	 * Setup for the jump to 64bit mode









	 *









	 * When the jump is performend we will be in long mode but









	 * When the jump is performed we will be in long mode but









	 * in 32bit compatibility mode with EFER.LME = 1, CS.L = 0, CS.D = 1









	 * (and in turn EFER.LMA = 1).	To jump into 64bit mode we use









	 * the new gdt/idt that has __KERNEL_CS with CS.L = 1.
































arch/x86/boot/compressed/kaslr.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -639,9 +639,9 @@ static bool process_mem_region(struct mem_vector *region,

















		if (slot_area_index == MAX_SLOT_AREA) {









			debug_putstr("Aborted e820/efi memmap scan (slot_areas full)!\n");









			return 1;









			return true;









		}









		return 0;









		return false;









	}



















#if defined(CONFIG_MEMORY_HOTREMOVE) && defined(CONFIG_ACPI)