linux-kernel - linux-next: manual merge of the akpm tree with the sparc-next 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130321163328.2c6dccabad6a8dc8fe4b0e24@canb.auug.org.au>
Date:	Thu, 21 Mar 2013 16:33:28 +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,
	Jiang Liu <liuj97@...il.com>, Tkhai Kirill <tkhai@...dex.ru>,
	David Miller <davem@...emloft.net>
Subject: linux-next: manual merge of the akpm tree with the sparc-next tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/sparc/mm/init_64.c between commit ce835e513a93 ("sparc64: Do not
change num_physpages during initmem freeing") from the sparc-next tree
and commit "mm/SPARC: use common help functions to free reserved pages"
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/sparc/mm/init_64.c
index 076068f,3f559d1..0000000
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@@ -2119,14 -2117,10 +2117,8 @@@ void free_initmem(void
  			((unsigned long) KERNBASE));
  		memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
  
--		if (do_free) {
- 			p = virt_to_page(page);
- 
- 			ClearPageReserved(p);
- 			init_page_count(p);
- 			__free_page(p);
- 			totalram_pages++;
- 		}
++		if (do_free)
+ 			free_reserved_page(virt_to_page(page));
 -			num_physpages++;
 -		}
  	}
  }
  

Content of type "application/pgp-signature" skipped