From 3aaa8dfae955d7bec462cc4e2fce185ef6d41b5a Mon Sep 17 00:00:00 2001 From: Andreas Färber Date: Mon, 14 May 2012 02:39:57 +0200 Subject: arm_boot: Pass ARMCPU to arm_load_kernel() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In particular this simplifies the &s->mpu->cpu->env expression again. first_cpu and ->next_cpu are expected to be QOM'ified later. Signed-off-by: Andreas Färber Acked-by: Igor Mitsyanko (for exynos) Acked-by: Peter Maydell --- hw/omap_sx1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/omap_sx1.c') diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c index b64e1ebebc..abca341926 100644 --- a/hw/omap_sx1.c +++ b/hw/omap_sx1.c @@ -202,7 +202,7 @@ static void sx1_init(ram_addr_t ram_size, sx1_binfo.kernel_filename = kernel_filename; sx1_binfo.kernel_cmdline = kernel_cmdline; sx1_binfo.initrd_filename = initrd_filename; - arm_load_kernel(&mpu->cpu->env, &sx1_binfo); + arm_load_kernel(mpu->cpu, &sx1_binfo); } /* TODO: fix next line */ -- cgit 1.4.1