summaryrefslogtreecommitdiffstats
path: root/AppPkg
diff options
context:
space:
mode:
authorLeif Lindholm <leif.lindholm@linaro.org>2018-11-01 14:51:50 +0000
committerLeif Lindholm <leif.lindholm@linaro.org>2019-02-04 17:07:47 +0000
commit3e583d345977eb9fda769aa3940ca186d190f757 (patch)
tree4ffebfeff5f5005d5a437c9d736f11ff86896fb1 /AppPkg
parent6c61ec4c62b6d1001e8ea6683e83f0e9ec0b3c9b (diff)
downloadedk2-3e583d345977eb9fda769aa3940ca186d190f757.tar.gz
edk2-3e583d345977eb9fda769aa3940ca186d190f757.tar.bz2
edk2-3e583d345977eb9fda769aa3940ca186d190f757.zip
AppPkg: fix webserver build for !Ia32/X64
The WebServer application is not meant to be Ia32/X64 specific, and would build for other architectures, if it wasn't for the #include <Register/Msr.h> in WebServer.h. Move that statement to Mtrr.c instead, which is the only consumer, and is already being filtered out for other architectures. Cc: Daryl McDaniel <edk2-lists@mc2research.org> Cc: Jaben Carsey <jaben.carsey@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Diffstat (limited to 'AppPkg')
-rw-r--r--AppPkg/Applications/Sockets/WebServer/Mtrr.c1
-rw-r--r--AppPkg/Applications/Sockets/WebServer/WebServer.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/AppPkg/Applications/Sockets/WebServer/Mtrr.c b/AppPkg/Applications/Sockets/WebServer/Mtrr.c
index 54356bde64..4b8482d4e2 100644
--- a/AppPkg/Applications/Sockets/WebServer/Mtrr.c
+++ b/AppPkg/Applications/Sockets/WebServer/Mtrr.c
@@ -15,6 +15,7 @@
#include <WebServer.h>
#include <Library/MtrrLib.h>
+#include <Register/Msr.h>
#define VARIABLE_MTRR_VALID 0x800
diff --git a/AppPkg/Applications/Sockets/WebServer/WebServer.h b/AppPkg/Applications/Sockets/WebServer/WebServer.h
index 21b07b63df..16c30c8d6d 100644
--- a/AppPkg/Applications/Sockets/WebServer/WebServer.h
+++ b/AppPkg/Applications/Sockets/WebServer/WebServer.h
@@ -20,7 +20,6 @@
#include <Guid/EventGroup.h>
-#include <Register/Msr.h>
#include <Library/BaseMemoryLib.h>
#include <Library/DebugLib.h>
#include <Library/MemoryAllocationLib.h>