From 92cd41d78e6162221c744aeb597700ace2220628 Mon Sep 17 00:00:00 2001
From: Peter Crosthwaite <crosthwaitepeter@gmail.com>
Date: Wed, 14 Feb 2018 08:16:38 -0500
Subject: [PATCH] memory_mapping: Rework cpu related includes

This makes it more consistent with all other core code files, which
either just rely on qemu-common.h inclusion or precede cpu.h with
qemu-common.h.

cpu-all.h should not be included in addition to cpu.h. Remove it.

Backports commit 94beb661bd90bcb477eed6d3b07aced988c40163 from qemu
---
 qemu/memory_mapping.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qemu/memory_mapping.c b/qemu/memory_mapping.c
index 324daa86..c5a98533 100644
--- a/qemu/memory_mapping.c
+++ b/qemu/memory_mapping.c
@@ -15,8 +15,8 @@
 
 #include "glib_compat.h"
 
+#include "qemu-common.h"
 #include "cpu.h"
-#include "exec/cpu-all.h"
 #include "sysemu/memory_mapping.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"