Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d99e3fe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 

Pull arch/tile bugfix from Chris Metcalf:
 "This just fixes a compiler warning from an old bug that only recently
  started generating a warning"

* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  tile: properly use node_isset() on a nodemask_t
parents 14bc84ce 9b0f5d63

arch/tile/kernel/setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -774,7 +774,7 @@ static void __init zone_sizes_init(void) 
		 * though, there'll be no lowmem, so we just alloc_bootmem

		 * though, there'll be no lowmem, so we just alloc_bootmem

		 * the memmap.  There will be no percpu memory either.

		 * the memmap.  There will be no percpu memory either.

		 */

		 */

		if (i != 0 && cpumask_test_cpu(i, &isolnodes)) {

		if (i != 0 && node_isset(i, isolnodes)) {

			node_memmap_pfn[i] =

			node_memmap_pfn[i] =

				alloc_bootmem_pfn(0, memmap_size, 0);

				alloc_bootmem_pfn(0, memmap_size, 0);

			BUG_ON(node_percpu[i] != 0);

			BUG_ON(node_percpu[i] != 0);