- i386-remove-unnecessary-align-in-vmlinuxldss.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     i386: remove unnecessary ALIGN() in vmlinux.lds.S
has been removed from the -mm tree.  Its filename was
     i386-remove-unnecessary-align-in-vmlinuxldss.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: i386: remove unnecessary ALIGN() in vmlinux.lds.S
From: Vivek Goyal <vgoyal@xxxxxxxxxx>

There seems to be one extra ALIGN(4096) before symbol __smp_alt_end.  The only
usage of __smp_alt_end is to mark the end of smp alternative sections so that
this memory can be freed.  As a physical page is freed one has to just make
sure that there is no other data on the same page where __smp_alt_end is
pointing.  There is already a ALIGN(4096) after this section which should take
care of the above issue.  Hence it looks like the ALIGN(4096) before
__smp_alt_end is redundant and not required.

Signed-off-by: Vivek Goyal <vgoyal@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 arch/i386/kernel/vmlinux.lds.S |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff -puN arch/i386/kernel/vmlinux.lds.S~i386-remove-unnecessary-align-in-vmlinuxldss arch/i386/kernel/vmlinux.lds.S
--- a/arch/i386/kernel/vmlinux.lds.S~i386-remove-unnecessary-align-in-vmlinuxldss
+++ a/arch/i386/kernel/vmlinux.lds.S
@@ -114,11 +114,15 @@ SECTIONS
   }
   .smp_altinstr_replacement : AT(ADDR(.smp_altinstr_replacement) - LOAD_OFFSET) {
 	*(.smp_altinstr_replacement)
-	. = ALIGN(4096);
 	__smp_alt_end = .;
   }
 
-  /* will be freed after init */
+  /* will be freed after init
+   * Following ALIGN() is required to make sure no other data falls on the
+   * same page where __smp_alt_end is pointing as that page might be freed
+   * after boot. Always make sure that ALIGN() directive is present after
+   * the section which contains __smp_alt_end.
+   */
   . = ALIGN(4096);		/* Init code and data */
   .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) {
   	__init_begin = .;
_

Patches currently in -mm which might be from vgoyal@xxxxxxxxxx are

i386-extend-bzimage-protocol-for-relocatable-protected-mode-kernel.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux