linux-next: manual merge of the akpm tree with Linus' tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in mm/highmem.c
between commit 498c22802123 ("mm: highmem: don't treat PKMAP_ADDR
(LAST_PKMAP) as a highmem address") from Linus' tree and commit "mm,
highmem: use PKMAP_NR() to calculate an index of pkmap" from the akpm
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 mm/highmem.c
index 09fc744,017cccc..0000000
--- a/mm/highmem.c
+++ b/mm/highmem.c
@@@ -98,8 -98,8 +98,8 @@@ struct page *kmap_to_page(void *vaddr
  {
  	unsigned long addr = (unsigned long)vaddr;
  
 -	if (addr >= PKMAP_ADDR(0) && addr <= PKMAP_ADDR(LAST_PKMAP)) {
 +	if (addr >= PKMAP_ADDR(0) && addr < PKMAP_ADDR(LAST_PKMAP)) {
- 		int i = (addr - PKMAP_ADDR(0)) >> PAGE_SHIFT;
+ 		int i = PKMAP_NR(addr);
  		return pte_page(pkmap_page_table[i]);
  	}

Attachment: pgpHSx1hLPPZC.pgp
Description: PGP signature