commit 3aaa8dfae955d7bec462cc4e2fce185ef6d41b5a
author Andreas Färber <afaerber@suse.de> Mon May 14 02:39:57 2012 +0200
committer Andreas Färber <afaerber@suse.de> Mon Jun 11 00:23:04 2012 +0200
tree 0cdd65f87cc18ed8d8f1a7476a6348b848588dc2
parent 17c2f0bf37182d46d66998bf037b2cac520d2183

arm_boot: Pass ARMCPU to arm_load_kernel()

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 <afaerber@suse.de>
Acked-by: Igor Mitsyanko <i.mitsyanko@samsung.com> (for exynos)
Acked-by: Peter Maydell <peter.maydell@linaro.org>

hw/spitz.c

diff --git a/hw/spitz.c b/hw/spitz.c
index d320633..20e7835 100644
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -932,7 +932,7 @@
     spitz_binfo.kernel_cmdline = kernel_cmdline;
     spitz_binfo.initrd_filename = initrd_filename;
     spitz_binfo.board_id = arm_id;
-    arm_load_kernel(&mpu->cpu->env, &spitz_binfo);
+    arm_load_kernel(mpu->cpu, &spitz_binfo);
     sl_bootparam_write(SL_PXA_PARAM_BASE);
 }