From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Marc - A. Dahlhaus [ Administration | Westermann GmbH ]" Subject: [patch] Remove a merge conflict leftover in arch/x86/mm/iomap_32.c Date: Tue, 17 Mar 2009 11:30:12 +0100 Message-ID: <1237285812.12068.30.camel@marc> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-Nu8mZYXOCfwnVMXTmtdR" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Xen-devel Cc: Jeremy Fitzhardinge List-Id: xen-devel@lists.xenproject.org --=-Nu8mZYXOCfwnVMXTmtdR Content-Type: text/plain Content-Transfer-Encoding: 7bit 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 --=-Nu8mZYXOCfwnVMXTmtdR Content-Disposition: attachment; filename="iomap_32_conflict.patch" Content-Type: text/x-patch; name="iomap_32_conflict.patch"; charset="ISO-8859-15" Content-Transfer-Encoding: 7bit Remove a merge conflict leftover in arch/x86/mm/iomap_32.c Signed-off-by: Marc A. Dahlhaus --- 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); --=-Nu8mZYXOCfwnVMXTmtdR Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --=-Nu8mZYXOCfwnVMXTmtdR--