---

yaml --- r: 205502 b: refs/heads/master c: 22a57f5 h: refs/heads/master v: v3
git-mirror · Aug 2, 2010 · 6be83e2 · 6be83e2
1 parent fe6a5e2
commit 6be83e2
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70b0d22d581a5deef7b2876b0c3774635b8d846c
+refs/heads/master: 22a57f5896df218356bae6203dfaf04bcfd6c88c
diff --git a/trunk/arch/x86/boot/compressed/head_32.S b/trunk/arch/x86/boot/compressed/head_32.S
@@ -123,6 +123,19 @@ relocated:
 	shrl	$2, %ecx
 	rep	stosl
 
+/*
+ * Adjust our own GOT
+ */
+	leal	_got(%ebx), %edx
+	leal	_egot(%ebx), %ecx
+1:
+	cmpl	%ecx, %edx
+	jae	2f
+	addl	%ebx, (%edx)
+	addl	$4, %edx
+	jmp	1b
+2:
+
 /*
  * Do the decompression, and jump to the new kernel..
  */

diff --git a/trunk/arch/x86/boot/compressed/head_64.S b/trunk/arch/x86/boot/compressed/head_64.S
@@ -279,6 +279,19 @@ relocated:
 	shrq	$3, %rcx
 	rep	stosq
 
+/*
+ * Adjust our own GOT
+ */
+	leaq	_got(%rip), %rdx
+	leaq	_egot(%rip), %rcx
+1:
+	cmpq	%rcx, %rdx
+	jae	2f
+	addq	%rbx, (%rdx)
+	addq	$8, %rdx
+	jmp	1b
+2:
+
 /*
  * Do the decompression, and jump to the new kernel..
  */

diff --git a/trunk/arch/x86/boot/compressed/vmlinux.lds.S b/trunk/arch/x86/boot/compressed/vmlinux.lds.S
@@ -41,6 +41,12 @@ SECTIONS
 		*(.rodata.*)
 		_erodata = . ;
 	}
+	.got : {
+		_got = .;
+		KEEP(*(.got.plt))
+		KEEP(*(.got))
+		_egot = .;
+	}
 	.data :	{
 		_data = . ;
 		*(.data)