linux-kernel - linux-next: manual merge of the akpm tree with the tip tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Mon, 4 Feb 2013 18:00:26 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	Yasuaki Ishimatsu <isimatu.yasuaki@...fujitsu.com>
Subject: linux-next: manual merge of the akpm tree with the tip tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/x86/mm/numa.c between commit 07f4207a305c ("x86-32, mm: Remove
reference to alloc_remap()") from the tip tree and commit "x86: get
pg_data_t's memory from other node" 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@...b.auug.org.au

diff --cc arch/x86/mm/numa.c
index a8483df,245a4ba..0000000
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@@ -209,22 -213,27 +209,21 @@@ static void __init setup_node_data(int 
  	       nid, start, end - 1);
  
  	/*
 -	 * Allocate node data.  Try remap allocator first, node-local
 -	 * memory and then any node.  Never allocate in DMA zone.
 +	 * Allocate node data.  Try node-local memory and then any node.
 +	 * Never allocate in DMA zone.
  	 */
- 	nd_pa = memblock_alloc_nid(nd_size, SMP_CACHE_BYTES, nid);
 -	nd = alloc_remap(nid, nd_size);
 -	if (nd) {
 -		nd_pa = __phys_addr_nodebug(nd);
 -		remapped = true;
 -	} else {
 -		nd_pa = memblock_alloc_try_nid(nd_size, SMP_CACHE_BYTES, nid);
 -		if (!nd_pa) {
 -			pr_err("Cannot find %zu bytes in any node\n", nd_size);
 -			return;
 -		}
 -		nd = __va(nd_pa);
++	nd_pa = memblock_alloc_try_nid(nd_size, SMP_CACHE_BYTES, nid);
 +	if (!nd_pa) {
- 		pr_err("Cannot find %zu bytes in node %d\n",
- 		       nd_size, nid);
++		pr_err("Cannot find %zu bytes in any node\n", nd_size);
 +		return;
  	}
 +	nd = __va(nd_pa);
  
  	/* report and initialize */
 -	printk(KERN_INFO "  NODE_DATA [mem %#010Lx-%#010Lx]%s\n",
 -	       nd_pa, nd_pa + nd_size - 1, remapped ? " (remapped)" : "");
 +	printk(KERN_INFO "  NODE_DATA [mem %#010Lx-%#010Lx]\n",
 +	       nd_pa, nd_pa + nd_size - 1);
  	tnid = early_pfn_to_nid(nd_pa >> PAGE_SHIFT);
 -	if (!remapped && tnid != nid)
 +	if (tnid != nid)
  		printk(KERN_INFO "    NODE_DATA(%d) on node %d\n", nid, tnid);
  
  	node_data[nid] = nd;

Content of type "application/pgp-signature" skipped