From: Michael Ellerman Date: Thu, 14 Nov 2019 08:19:20 +0000 (+1100) Subject: Merge branch 'topic/kaslr-book3e32' into next X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3df191118b4ca20f58c7a84e59330c6b9d99454b;p=linux.git Merge branch 'topic/kaslr-book3e32' into next This is a slight rebase of Scott's next branch, which contained the KASLR support for book3e 32-bit, to squash in a couple of small fixes. See the original pull request: https://lore.kernel.org/r/20191022232155.GA26174@home.buserror.net --- 3df191118b4ca20f58c7a84e59330c6b9d99454b diff --cc arch/powerpc/mm/init_64.c index 83d8c7122d132,28b9596b4b908..4002ced3596f7 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c @@@ -63,15 -63,10 +63,10 @@@ #include - phys_addr_t memstart_addr = ~0; - EXPORT_SYMBOL_GPL(memstart_addr); - phys_addr_t kernstart_addr; - EXPORT_SYMBOL_GPL(kernstart_addr); - #ifdef CONFIG_SPARSEMEM_VMEMMAP /* - * Given an address within the vmemmap, determine the pfn of the page that - * represents the start of the section it is within. Note that we have to + * Given an address within the vmemmap, determine the page that + * represents the start of the subsection it is within. Note that we have to * do this by hand as the proffered address may not be correctly aligned. * Subtraction of non-aligned pointers produces undefined results. */