linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Anton Blanchard <anton@samba.org>
To: benh@kernel.crashing.org, paulus@samba.org, mpe@ellerman.id.au,
	paulmck@linux.vnet.ibm.com, Emilian.Medve@Freescale.com
Cc: linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 2/5] powerpc: Remove some old bootmem related comments
Date: Tue, 5 Aug 2014 16:33:54 +1000	[thread overview]
Message-ID: <20140805163354.2c93683e@kryten> (raw)
In-Reply-To: <20140805163218.47c86615@kryten>

Now bootmem is gone from powerpc we can remove comments mentioning it.

Signed-off-by: Anton Blanchard <anton@samba.org>
---

Index: b/arch/powerpc/kernel/prom.c
===================================================================
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -695,10 +695,7 @@ void __init early_init_devtree(void *par
 		reserve_crashkernel();
 	early_reserve_mem();
 
-	/*
-	 * Ensure that total memory size is page-aligned, because otherwise
-	 * mark_bootmem() gets upset.
-	 */
+	/* Ensure that total memory size is page-aligned. */
 	limit = ALIGN(memory_limit ?: memblock_phys_mem_size(), PAGE_SIZE);
 	memblock_enforce_memory_limit(limit);
 
Index: b/arch/powerpc/kernel/rtas.c
===================================================================
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -1091,8 +1091,8 @@ asmlinkage int ppc_rtas(struct rtas_args
 }
 
 /*
- * Call early during boot, before mem init or bootmem, to retrieve the RTAS
- * informations from the device-tree and allocate the RMO buffer for userland
+ * Call early during boot, before mem init, to retrieve the RTAS
+ * information from the device-tree and allocate the RMO buffer for userland
  * accesses.
  */
 void __init rtas_initialize(void)
Index: b/arch/powerpc/mm/pgtable_64.c
===================================================================
--- a/arch/powerpc/mm/pgtable_64.c
+++ b/arch/powerpc/mm/pgtable_64.c
@@ -106,10 +106,6 @@ int map_kernel_page(unsigned long ea, un
 							  __pgprot(flags)));
 	} else {
 #ifdef CONFIG_PPC_MMU_NOHASH
-		/* Warning ! This will blow up if bootmem is not initialized
-		 * which our ppc64 code is keen to do that, we'll need to
-		 * fix it and/or be more careful
-		 */
 		pgdp = pgd_offset_k(ea);
 #ifdef PUD_TABLE_SIZE
 		if (pgd_none(*pgdp)) {
Index: b/arch/powerpc/kvm/book3s_hv_builtin.c
===================================================================
--- a/arch/powerpc/kvm/book3s_hv_builtin.c
+++ b/arch/powerpc/kvm/book3s_hv_builtin.c
@@ -148,7 +148,7 @@ EXPORT_SYMBOL_GPL(kvm_release_hpt);
  * kvm_cma_reserve() - reserve area for kvm hash pagetable
  *
  * This function reserves memory from early allocator. It should be
- * called by arch specific code once the early allocator (memblock or bootmem)
+ * called by arch specific code once the memblock allocator
  * has been activated and all other subsystems have already allocated/reserved
  * memory.
  */
Index: b/arch/powerpc/kvm/book3s_hv_cma.c
===================================================================
--- a/arch/powerpc/kvm/book3s_hv_cma.c
+++ b/arch/powerpc/kvm/book3s_hv_cma.c
@@ -42,7 +42,7 @@ static struct kvm_cma kvm_cma_area;
  * @alignment:  Alignment for the contiguous memory area
  *
  * This function reserves memory for kvm cma area. It should be
- * called by arch code when early allocator (memblock or bootmem)
+ * called by arch code when the memblock allocator
  * is still activate.
  */
 long __init kvm_cma_declare_contiguous(phys_addr_t size, phys_addr_t alignment)
Index: b/arch/powerpc/mm/hugetlbpage.c
===================================================================
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -276,7 +276,7 @@ pte_t *huge_pte_alloc(struct mm_struct *
 
 #ifdef CONFIG_PPC_FSL_BOOK3E
 /* Build list of addresses of gigantic pages.  This function is used in early
- * boot before the buddy or bootmem allocator is setup.
+ * boot before the buddy allocator is setup.
  */
 void add_gpage(u64 addr, u64 page_size, unsigned long number_of_pages)
 {
@@ -399,7 +399,7 @@ void __init reserve_hugetlb_gpages(void)
 #else /* !PPC_FSL_BOOK3E */
 
 /* Build list of addresses of gigantic pages.  This function is used in early
- * boot before the buddy or bootmem allocator is setup.
+ * boot before the buddy allocator is setup.
  */
 void add_gpage(u64 addr, u64 page_size, unsigned long number_of_pages)
 {

  reply	other threads:[~2014-08-05  6:33 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-05  6:32 [PATCH 1/5] powerpc: Remove bootmem allocator Anton Blanchard
2014-08-05  6:33 ` Anton Blanchard [this message]
2014-08-05  6:34 ` [PATCH 3/5] powerpc: Remove superfluous bootmem includes Anton Blanchard
2014-08-05  6:35 ` [PATCH 4/5] powerpc: Move sparse_init() into initmem_init Anton Blanchard
2014-08-05  6:37 ` [PATCH 5/5] powerpc: make __ffs return unsigned long Anton Blanchard
  -- strict thread matches above, loose matches on Subject: below --
2014-09-17  5:58 [PATCH 1/5] powerpc: Remove bootmem allocator Anton Blanchard
2014-09-17  5:58 ` [PATCH 2/5] powerpc: Remove some old bootmem related comments Anton Blanchard
2014-09-17 12:15 [PATCH 1/5] powerpc: Remove bootmem allocator Anton Blanchard
2014-09-17 12:15 ` [PATCH 2/5] powerpc: Remove some old bootmem related comments Anton Blanchard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140805163354.2c93683e@kryten \
    --to=anton@samba.org \
    --cc=Emilian.Medve@Freescale.com \
    --cc=benh@kernel.crashing.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mpe@ellerman.id.au \
    --cc=paulmck@linux.vnet.ibm.com \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).