linux-next: manual merge of the akpm-current tree with the arc tree

[Stephen Rothwell]

Hi Andrew,

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

  arch/arc/mm/cache.c

between commit:

  336e2136e135 ("ARC: mm: preps ahead of HIGHMEM support")

from the arc tree and commit:

  c386768017da ("mm: differentiate page_mapped() from page_mapcount() for compound pages")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arc/mm/cache.c
index ff7ff6cbb811,875ac2e918c5..000000000000
--- a/arch/arc/mm/cache.c
+++ b/arch/arc/mm/cache.c
@@@ -617,10 -582,10 +617,10 @@@ void flush_dcache_page(struct page *pag
  	 */
  	if (!mapping_mapped(mapping)) {
  		clear_bit(PG_dc_clean, &page->flags);
- 	} else if (page_mapped(page)) {
+ 	} else if (page_mapcount(page)) {
  
  		/* kernel reading from page with U-mapping */
 -		unsigned long paddr = (unsigned long)page_address(page);
 +		phys_addr_t paddr = (unsigned long)page_address(page);
  		unsigned long vaddr = page->index << PAGE_CACHE_SHIFT;
  
  		if (addr_not_cache_congruent(paddr, vaddr))
@@@ -853,12 -818,9 +853,12 @@@ void copy_user_highpage(struct page *to
  	 *
  	 * Note that while @u_vaddr refers to DST page's userspace vaddr, it is
  	 * equally valid for SRC page as well
 +	 *
 +	 * For !VIPT cache, all of this gets compiled out as
 +	 * addr_not_cache_congruent() is 0
  	 */
- 	if (page_mapped(from) && addr_not_cache_congruent(kfrom, u_vaddr)) {
+ 	if (page_mapcount(from) && addr_not_cache_congruent(kfrom, u_vaddr)) {
 -		__flush_dcache_page(kfrom, u_vaddr);
 +		__flush_dcache_page((unsigned long)kfrom, u_vaddr);
  		clean_src_k_mappings = 1;
  	}
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/