[patch] interdiff patch fixing the problem (pax-linux-3.4.7-test28 -> 29)

pax-linux-3.4.7-test28-29-diff.patch (text/plain), 1.62 KB, created by Maxim Kammerer on 2012-08-06 15:13:39 UTC

diff -u linux-3.4.7-pax/arch/x86/platform/efi/efi_stub_32.S linux-3.4.7-pax/arch/x86/platform/efi/efi_stub_32.S
--- linux-3.4.7-pax/arch/x86/platform/efi/efi_stub_32.S	2012-05-21 12:10:09.796048903 +0200
+++ linux-3.4.7-pax/arch/x86/platform/efi/efi_stub_32.S	2012-08-06 13:14:35.823038121 +0200
@@ -38,12 +38,24 @@
 	 * The mapping of lower virtual memory has been created in prelog and
 	 * epilog.
 	 */
+#ifdef CONFIG_PAX_KERNEXEC
 	movl	$(__KERNEXEC_EFI_DS), %edx
 	mov	%edx, %ds
 	mov	%edx, %es
 	mov	%edx, %ss
-	ljmp $(__KERNEXEC_EFI_CS),$1f-__PAGE_OFFSET
+	addl	$2f,(1f)
+	ljmp	*(1f)
+
+__INITDATA
+1:	.long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
+.previous
+
+2:
+	subl	$2b,(1b)
+#else
+	jmp	1f-__PAGE_OFFSET
 1:
+#endif
 
 	/*
 	 * 2. Now on the top of stack is the return
@@ -90,12 +102,16 @@
 	 * 8. Now restore the virtual mode from flat mode by
 	 * adding EIP with PAGE_OFFSET.
 	 */
-	ljmp $(__KERNEL_CS),$1f+__PAGE_OFFSET
-1:
+#ifdef CONFIG_PAX_KERNEXEC
 	movl	$(__KERNEL_DS), %edx
 	mov	%edx, %ds
 	mov	%edx, %es
 	mov	%edx, %ss
+	ljmp	$(__KERNEL_CS),$1f
+#else
+	jmp	1f+__PAGE_OFFSET
+#endif
+1:
 
 	/*
 	 * 9. Balance the stack. And because EAX contain the return value,
only in patch2:
unchanged:
--- linux-3.4.7/arch/x86/pci/i386.c	2012-05-21 11:32:58.231927701 +0200
+++ linux-3.4.7-pax/arch/x86/pci/i386.c	2012-08-06 12:38:41.943153420 +0200
@@ -57,7 +57,7 @@ static struct pcibios_fwaddrmap *pcibios
 {
 	struct pcibios_fwaddrmap *map;
 
-	WARN_ON(!spin_is_locked(&pcibios_fwaddrmap_lock));
+	WARN_ON_SMP(!spin_is_locked(&pcibios_fwaddrmap_lock));
 
 	list_for_each_entry(map, &pcibios_fwaddrmappings, list)
 		if (map->dev == dev)