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

Commit 26a5c0df 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 smaller cleanups"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, pageattr: Correct WBINVD spelling in comment
  x86, crash: Unify ifdef
  x86, boot: Correct max ramdisk size name
parents 54cad627 b82ad3d3

Documentation/x86/boot.txt

+2 −2
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ Offset Proto Name Meaning 
0226/1	2.02+(3 ext_loader_ver	Extended boot loader version

0227/1	2.02+(3	ext_loader_type	Extended boot loader ID

0228/4	2.02+	cmd_line_ptr	32-bit pointer to the kernel command line

022C/4	2.03+	ramdisk_max	Highest legal initrd address

022C/4	2.03+	initrd_addr_max	Highest legal initrd address

0230/4	2.05+	kernel_alignment Physical addr alignment required for kernel

0234/1	2.05+	relocatable_kernel Whether kernel is relocatable or not

0235/1	2.10+	min_alignment	Minimum alignment, as a power of two
@@ -534,7 +534,7 @@ Protocol: 2.02+ 
  zero, the kernel will assume that your boot loader does not support

  the 2.02+ protocol.



Field name:	ramdisk_max

Field name:	initrd_addr_max

Type:		read

Offset/size:	0x22c/4

Protocol:	2.03+

arch/x86/boot/header.S

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ cmd_line_ptr: .long 0 # (Header version 0x0202 or later) 
					# can be located anywhere in

					# low memory 0x10000 or higher.



ramdisk_max:	.long 0x7fffffff

initrd_addr_max: .long 0x7fffffff

					# (Header version 0x0203 or later)

					# The highest safe address for

					# the contents of an initrd

arch/x86/kernel/crash.c

+0 −2
Original line number Diff line number Diff line
@@ -57,9 +57,7 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs) 
{

#ifdef CONFIG_X86_32

	struct pt_regs fixed_regs;

#endif



#ifdef CONFIG_X86_32

	if (!user_mode_vm(regs)) {

		crash_fixup_ss_esp(&fixed_regs, regs);

		regs = &fixed_regs;

arch/x86/mm/pageattr.c

+3 −3
Original line number Diff line number Diff line
@@ -1377,10 +1377,10 @@ static int change_page_attr_set_clr(unsigned long *addr, int numpages, 
	cache = cache_attr(mask_set);



	/*

	 * On success we use clflush, when the CPU supports it to

	 * avoid the wbindv. If the CPU does not support it and in the

	 * On success we use CLFLUSH, when the CPU supports it to

	 * avoid the WBINVD. If the CPU does not support it and in the

	 * error case we fall back to cpa_flush_all (which uses

	 * wbindv):

	 * WBINVD):

	 */

	if (!ret && cpu_has_clflush) {

		if (cpa.flags & (CPA_PAGES_ARRAY | CPA_ARRAY)) {