Skip to contentSkip to conversation

x86: wakeup.lds.S - section ordering fix

PATCH Applied Cyrill Gorcunov 3 participants 4 messages May 11, 2008 – May 13, 2008

Subsystems (2)
x86 ACPI
lore
Share & tools
lore

Cyrill Gorcunov

author
#0 lore raw

PATCH 1/1 x86: wakeup.lds.S - section ordering fix

To allow linker to catch sections overlapping we have to declare them in appropriate order.

Signed-off-by Cyrill Gorcunov <[email protected]>

---

Please test and review

arch/x86/kernel/acpi/realmode/wakeup.lds.S +5 -5
Index: linux-2.6.git/arch/x86/kernel/acpi/realmode/wakeup.lds.S
===================================================================
@@ -12,11 +12,6 @@ ENTRY(_start)
 
 SECTIONS
 {
-	. = HEADER_OFFSET;
-	.header : {
-		 *(.header)
-	}
-
 	. = 0;
 	.text : {
 		 *(.text*)

@@ -50,6 +45,11 @@ SECTIONS
 		__bss_end = .;
 	}
 
+	. = HEADER_OFFSET;
+	.header : {
+		*(.header)
+	}
+
 	. = ALIGN(16);
 	_end = .;
#1 lore raw
Quoted 7 lines · Cyrill Gorcunov

To allow linker to catch sections overlapping we have to declare them in appropriate order.

Signed-off-by Cyrill Gorcunov <[email protected]>

---

Please test and review

Looks okay to me, but I can't easily test it right now.

But I think Rafael tested identical patch, you can add my ACK in such case.

Pavel

Quoted 28 lines

Index: linux-2.6.git/arch/x86/kernel/acpi/realmode/wakeup.lds.S
===================================================================

arch/x86/kernel/acpi/realmode/wakeup.lds.S +5 -5
@@ -12,11 +12,6 @@ ENTRY(_start)
 
 SECTIONS
 {
-	. = HEADER_OFFSET;
-	.header : {
-		 *(.header)
-	}
-
 	. = 0;
 	.text : {
 		 *(.text*)

@@ -50,6 +45,11 @@ SECTIONS
 		__bss_end = .;
 	}
 
+	. = HEADER_OFFSET;
+	.header : {
+		*(.header)
+	}
+
 	. = ALIGN(16);
 	_end = .;
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
author Acked-by Pavel Machek
#2 lore raw

[Pavel Machek - Mon, May 12, 2008 at 03:53:43PM +0200]

| On Sun 2008-05-11 22:46:38, Cyrill Gorcunov wrote:
| > To allow linker to catch sections overlapping we have to declare
| > them in appropriate order.
| > 
| > Signed-off-by: Cyrill Gorcunov <[email protected]>
| > ---
| > 
| > Please test and review
| 
| Looks okay to me, but I can't easily test it right now.
| 
| But I think Rafael tested identical patch, you can add my ACK in such
| case.
| 
| 								Pavel
|

Yes, Rafael tested the same (in contents) patch. Actually there was a bit time-screwed situation - I've proposed a solution, Peter was agreed with, I said him that I'll cook a patch, meanwhile I've got an internet connection problem, and at moment Rafael tested the same patch he made by own. A bit funny situation ;) So I think in this patch should be then:

Signed-off-by Rafael J. Wysocki <[email protected]>
Signed-off-by Cyrill Gorcunov <[email protected]>
Acked-by Pavel Machek <[email protected]>

Anyway, thanks to all being involved ;)

- Cyrill -

Applied
#3 lore raw
Quoted 15 lines · Cyrill Gorcunov

[Pavel Machek - Mon, May 12, 2008 at 03:53:43PM +0200]

| On Sun 2008-05-11 22:46:38, Cyrill Gorcunov wrote:
| > To allow linker to catch sections overlapping we have to declare
| > them in appropriate order.
| > 
| > Signed-off-by: Cyrill Gorcunov <[email protected]>
| > ---
| > 
| > Please test and review
| 
| Looks okay to me, but I can't easily test it right now.
| 
| But I think Rafael tested identical patch, you can add my ACK in such
| case.
Quoted 6 lines

Yes, Rafael tested the same (in contents) patch. Actually there was a bit time-screwed situation - I've proposed a solution, Peter was agreed with, I said him that I'll cook a patch, meanwhile I've got an internet connection problem, and at moment Rafael tested the same patch he made by own. A bit funny situation ;) So I think in this patch should be then:

applied, thanks.

Ingo