From: Yinghai Lu <yinghai@kernel.org>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Ingo Molnar <mingo@elte.hu>, Michal Simek <monstr@monstr.eu>,
"H. Peter Anvin" <hpa@zytor.com>
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org,
Stephen Rothwell <sfr@canb.auug.org.au>
Subject: [PATCH] microblaze, memblock: fix compiling
Date: Sat, 11 Sep 2010 00:07:06 -0700 [thread overview]
Message-ID: <4C8B2A9A.1040303@kernel.org> (raw)
In-Reply-To: <1284106711.6515.46.camel@pasglop>
From: Michal Simek <monstr@monstr.eu>
CC arch/microblaze/mm/init.o
arch/microblaze/mm/init.c: In function 'mm_cmdline_setup':
arch/microblaze/mm/init.c:236: error: 'struct memblock_type' has no member named 'region'
arch/microblaze/mm/init.c: In function 'mmu_init':
arch/microblaze/mm/init.c:279: error: 'struct memblock_type' has no member named 'region'
arch/microblaze/mm/init.c:284: error: 'struct memblock_type' has no member named 'region'
arch/microblaze/mm/init.c:285: error: 'struct memblock_type' has no member named 'region'
arch/microblaze/mm/init.c:286: error: 'struct memblock_type' has no member named 'region'
make[1]: *** [arch/microblaze/mm/init.o] Error 1
make: *** [arch/microblaze/mm] Error 2
with this fix and microblaze can boot
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Index: linux-2.6/arch/microblaze/mm/init.c
===================================================================
--- linux-2.6.orig/arch/microblaze/mm/init.c
+++ linux-2.6/arch/microblaze/mm/init.c
@@ -228,7 +228,7 @@ static void mm_cmdline_setup(void)
if (maxmem && memory_size > maxmem) {
memory_size = maxmem;
memory_end = memory_start + memory_size;
- memblock.memory.region[0].size = memory_size;
+ memblock.memory.regions[0].size = memory_size;
}
}
}
@@ -271,14 +271,14 @@ asmlinkage void __init mmu_init(void)
machine_restart(NULL);
}
- if ((u32) memblock.memory.region[0].size < 0x1000000) {
+ if ((u32) memblock.memory.regions[0].size < 0x1000000) {
printk(KERN_EMERG "Memory must be greater than 16MB\n");
machine_restart(NULL);
}
/* Find main memory where the kernel is */
- memory_start = (u32) memblock.memory.region[0].base;
- memory_end = (u32) memblock.memory.region[0].base +
- (u32) memblock.memory.region[0].size;
+ memory_start = (u32) memblock.memory.regions[0].base;
+ memory_end = (u32) memblock.memory.regions[0].base +
+ (u32) memblock.memory.regions[0].size;
memory_size = memory_end - memory_start;
mm_cmdline_setup(); /* FIXME parse args from command line - not used */
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2010-09-11 7:07 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-06 5:14 memblock updates Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 01/43] memblock: Fix memblock_is_region_reserved() to return a boolean Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 02/43] memblock: Rename memblock_region to memblock_type and memblock_property to memblock_region Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 03/43] memblock: No reason to include asm/memblock.h late Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 04/43] memblock: Implement memblock_is_memory and memblock_is_region_memory Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 05/43] memblock/arm: pfn_valid uses memblock_is_memory() Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 06/43] memblock/arm: Use memblock_region_is_memory() for omap fb Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 07/43] memblock: Introduce for_each_memblock() and new accessors Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 08/43] memblock/microblaze: Use " Benjamin Herrenschmidt
2010-08-06 8:52 ` Michal Simek
2010-08-06 22:50 ` Benjamin Herrenschmidt
2010-09-09 10:57 ` Michal Simek
2010-09-09 11:06 ` Stephen Rothwell
2010-09-09 11:54 ` Ingo Molnar
2010-09-10 8:18 ` Benjamin Herrenschmidt
2010-09-11 7:07 ` Yinghai Lu [this message]
2010-09-11 7:08 ` [PATCH] powerpc, memblock: fix will memblock reference Yinghai Lu
2010-09-11 7:29 ` [PATCH 08/43] memblock/microblaze: Use new accessors Ingo Molnar
2010-09-10 8:17 ` Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 09/43] memblock/sh: " Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 10/43] memblock/sparc: " Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 11/43] memblock/powerpc: " Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 12/43] memblock/arm: " Benjamin Herrenschmidt
2010-08-10 7:11 ` Russell King - ARM Linux
2010-08-06 5:14 ` [PATCH 13/43] memblock: Remove obsolete accessors Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 14/43] memblock: Remove memblock_find() Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 15/43] memblock: Remove nid_range argument, arch provides memblock_nid_range() instead Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 16/43] memblock: Factor the lowest level alloc function Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 17/43] memblock: Expose MEMBLOCK_ALLOC_ANYWHERE Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 18/43] memblock: Introduce default allocation limit and use it to replace explicit ones Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 19/43] memblock: Remove rmo_size, burry it in arch/powerpc where it belongs Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 20/43] memblock: Change u64 to phys_addr_t Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 21/43] memblock: Remove unused memblock.debug struct member Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 22/43] memblock: Remove memblock_type.size and add memblock.memory_size instead Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 23/43] memblock: Move memblock arrays to static storage in memblock.c and make their size a variable Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 24/43] memblock: Add debug markers at the end of the array Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 25/43] memblock: Make memblock_find_region() out of memblock_alloc_region() Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 26/43] memblock: Define MEMBLOCK_ERROR internally instead of using ~(phys_addr_t)0 Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 27/43] memblock: Move memblock_init() to the bottom of the file Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 28/43] memblock: split memblock_find_base() out of __memblock_alloc_base() Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 29/43] memblock: Move functions around into a more sensible order Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 30/43] memblock: Add array resizing support Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 31/43] memblock: Add arch function to control coalescing of memblock memory regions Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 32/43] memblock: Add "start" argument to memblock_find_base() Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 33/43] memblock: NUMA allocate can now use early_pfn_map Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 34/43] memblock: Separate memblock_alloc_nid() and memblock_alloc_try_nid() Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 35/43] memblock: Make memblock_alloc_try_nid() fallback to MEMBLOCK_ALLOC_ANYWHERE Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 36/43] memblock: Add debugfs files to dump the arrays content Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 37/43] memblock: Expose some memblock bits for use by x86 Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 38/43] memblock: Improve debug output when resizing the reserve array Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 39/43] memblock: Export MEMBLOCK_ERROR Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 40/43] memblock: Make MEMBLOCK_ERROR be 0 Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 41/43] memblock: Protect memblock.h with CONFIG_HAVE_MEMBLOCK Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 42/43] memblock: Option for the architecture to put memblock into the .init section Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 43/43] memblock: Add memblock_find_in_range() Benjamin Herrenschmidt
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=4C8B2A9A.1040303@kernel.org \
--to=yinghai@kernel.org \
--cc=benh@kernel.crashing.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mingo@elte.hu \
--cc=monstr@monstr.eu \
--cc=sfr@canb.auug.org.au \
/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).