[patch] Remove a merge conflict leftover in arch/x86/mm/iomap_32.c

[patch] Remove a merge conflict leftover in arch/x86/mm/iomap_32.c

[Marc - A. Dahlhaus [ Administration | Westermann GmbH ]]

[-- Attachment #1: Type: text/plain, Size: 819 bytes --]

Hello Jeremy,


there was a merge conflict in hackery which left over some noise.

Bild Errors:
  CC      arch/x86/mm/iomap_32.o
arch/x86/mm/iomap_32.c: In function 'iomap_atomic_prot_pfn':
arch/x86/mm/iomap_32.c:63: error: expected expression before '<<' token
arch/x86/mm/iomap_32.c:65: error: 'vaddr' undeclared (first use in this
function)
arch/x86/mm/iomap_32.c:65: error: (Each undeclared identifier is
reported only once
arch/x86/mm/iomap_32.c:65: error: for each function it appears in.)
arch/x86/mm/iomap_32.c:65: error: 'idx' undeclared (first use in this
function)
arch/x86/mm/iomap_32.c:69: error: expected expression before '==' token
arch/x86/mm/iomap_32.c:71: error: expected expression before '>>' token
make[1]: *** [arch/x86/mm/iomap_32.o] Error 1
make: *** [arch/x86/mm] Error 2

Fix attached.

Marc

[-- Attachment #2: iomap_32_conflict.patch --]
[-- Type: text/x-patch, Size: 677 bytes --]

Remove a merge conflict leftover in arch/x86/mm/iomap_32.c

Signed-off-by: Marc A. Dahlhaus <mad@wol.de>

--- a/arch/x86/mm/iomap_32.c
+++ b/arch/x86/mm/iomap_32.c
@@ -60,15 +60,7 @@ iomap_atomic_prot_pfn(unsigned long pfn,
 	if (!pat_enabled && pgprot_val(prot) == pgprot_val(PAGE_KERNEL_WC))
 		prot = PAGE_KERNEL_UC_MINUS;
 
-<<<<<<< HEAD:arch/x86/mm/iomap_32.c
-	idx = type + KM_TYPE_NR*smp_processor_id();
-	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
-	set_pte(kmap_pte-idx, pfn_pte(pfn, prot));
-
-	return (void*) vaddr;
-=======
 	return kmap_atomic_prot_pfn(pfn, type, prot);
->>>>>>> tip/master:arch/x86/mm/iomap_32.c
 }
 EXPORT_SYMBOL_GPL(iomap_atomic_prot_pfn);
 

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel