linux-kernel - [tip:core/memblock] memblock, microblaze: Fix memblock API change fallout

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-prev] [thread-next>] [day] [month] [year] [list]

Date:	Sat, 11 Sep 2010 07:34:01 GMT
From:	tip-bot for Yinghai Lu <yinghai@...nel.org>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
	yinghai@...nel.org, benh@...nel.crashing.org, monstr@...str.eu,
	tglx@...utronix.de, sfr@...b.auug.org.au, mingo@...e.hu
Subject: [tip:core/memblock] memblock, microblaze: Fix memblock API change fallout

Commit-ID:  78cf195c41a69521f4b3e3fd8b8bd4ecbfcdac85
Gitweb:     http://git.kernel.org/tip/78cf195c41a69521f4b3e3fd8b8bd4ecbfcdac85
Author:     Yinghai Lu <yinghai@...nel.org>
AuthorDate: Sat, 11 Sep 2010 00:07:06 -0700
Committer:  Ingo Molnar <mingo@...e.hu>
CommitDate: Sat, 11 Sep 2010 09:26:43 +0200

memblock, microblaze: Fix memblock API change fallout

Michal Simek reported this build failure:

  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'
 ...

Adopt Microblaze to the memblock API changes.

Reported-by: Michal Simek <monstr@...str.eu>
Signed-off-by: Yinghai Lu <yinghai@...nel.org>
Cc: linux-mm@...ck.org
Cc: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Benjamin Herrenschmidt <benh@...nel.crashing.org>
LKML-Reference: <4C8B2A9A.1040303@...nel.org>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
 arch/microblaze/mm/init.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index 840026c..c843786 100644
--- a/arch/microblaze/mm/init.c
+++ b/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 from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/