Xen devel - Mar 2009 - [patch] Remove a merge conflict leftover in arch/x86/mm/iomap_32.c

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


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