linux-next: manual merge of the openrisc tree with the mm-stable tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the openrisc tree got a conflict in:

  arch/openrisc/mm/ioremap.c

between commits:

  53c98e35dcbc ("openrisc: mm: remove unneeded early ioremap code")
  9b994429fe18 ("openrisc: mm: convert to GENERIC_IOREMAP")

from the mm-stable tree and commit:

  c289330331eb ("openrisc: Remove kernel-doc marker from ioremap comment")

from the openrisc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/openrisc/mm/ioremap.c
index 91c8259d4b7e,c6717f876c1c..000000000000
--- a/arch/openrisc/mm/ioremap.c
+++ b/arch/openrisc/mm/ioremap.c
@@@ -22,7 -22,89 +22,7 @@@
  
  extern int mem_init_done;
  
- /**
 -static unsigned int fixmaps_used __initdata;
 -
 -/*
 - * Remap an arbitrary physical address space into the kernel virtual
 - * address space. Needed when the kernel wants to access high addresses
 - * directly.
 - *
 - * NOTE! We need to allow non-page-aligned mappings too: we will obviously
 - * have to convert them into an offset in a page-aligned mapping, but the
 - * caller shouldn't need to know that small detail.
 - */
 -void __iomem *__ref ioremap(phys_addr_t addr, unsigned long size)
 -{
 -	phys_addr_t p;
 -	unsigned long v;
 -	unsigned long offset, last_addr;
 -	struct vm_struct *area = NULL;
 -
 -	/* Don't allow wraparound or zero size */
 -	last_addr = addr + size - 1;
 -	if (!size || last_addr < addr)
 -		return NULL;
 -
 -	/*
 -	 * Mappings have to be page-aligned
 -	 */
 -	offset = addr & ~PAGE_MASK;
 -	p = addr & PAGE_MASK;
 -	size = PAGE_ALIGN(last_addr + 1) - p;
 -
 -	if (likely(mem_init_done)) {
 -		area = get_vm_area(size, VM_IOREMAP);
 -		if (!area)
 -			return NULL;
 -		v = (unsigned long)area->addr;
 -	} else {
 -		if ((fixmaps_used + (size >> PAGE_SHIFT)) > FIX_N_IOREMAPS)
 -			return NULL;
 -		v = fix_to_virt(FIX_IOREMAP_BEGIN + fixmaps_used);
 -		fixmaps_used += (size >> PAGE_SHIFT);
 -	}
 -
 -	if (ioremap_page_range(v, v + size, p,
 -			__pgprot(pgprot_val(PAGE_KERNEL) | _PAGE_CI))) {
 -		if (likely(mem_init_done))
 -			vfree(area->addr);
 -		else
 -			fixmaps_used -= (size >> PAGE_SHIFT);
 -		return NULL;
 -	}
 -
 -	return (void __iomem *)(offset + (char *)v);
 -}
 -EXPORT_SYMBOL(ioremap);
 -
 -void iounmap(volatile void __iomem *addr)
 -{
 -	/* If the page is from the fixmap pool then we just clear out
 -	 * the fixmap mapping.
 -	 */
 -	if (unlikely((unsigned long)addr > FIXADDR_START)) {
 -		/* This is a bit broken... we don't really know
 -		 * how big the area is so it's difficult to know
 -		 * how many fixed pages to invalidate...
 -		 * just flush tlb and hope for the best...
 -		 * consider this a FIXME
 -		 *
 -		 * Really we should be clearing out one or more page
 -		 * table entries for these virtual addresses so that
 -		 * future references cause a page fault... for now, we
 -		 * rely on two things:
 -		 *   i)  this code never gets called on known boards
 -		 *   ii) invalid accesses to the freed areas aren't made
 -		 */
 -		flush_tlb_all();
 -		return;
 -	}
 -
 -	return vfree((void *)(PAGE_MASK & (unsigned long)addr));
 -}
 -EXPORT_SYMBOL(iounmap);
 -
+ /*
   * OK, this one's a bit tricky... ioremap can get called before memory is
   * initialized (early serial console does this) and will want to alloc a page
   * for its mapping.  No userspace pages will ever get allocated before memory

Attachment: pgp1HHN7PQcrj.pgp
Description: OpenPGP digital signature