From: Leif Lindholm <leif.lindholm@linaro.org>
To: edk2-devel@lists.01.org
Cc: "Kinney, Michael D" <michael.d.kinney@intel.com>,
Daryl McDaniel <edk2-lists@mc2research.org>,
Jaben Carsey <jaben.carsey@intel.com>
Subject: [PATCH v2] AppPkg: fix webserver build for !Ia32/X64
Date: Fri, 2 Nov 2018 10:50:15 +0000 [thread overview]
Message-ID: <20181102105015.3609-1-leif.lindholm@linaro.org> (raw)
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>
---
Resending only 1/6, since the others got R-b already.
Looking at PageList.c, the app was clearly intended to be portable,
so updated commit message to reflect this.
AppPkg/Applications/Sockets/WebServer/WebServer.h | 1 -
AppPkg/Applications/Sockets/WebServer/Mtrr.c | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
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>
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
--
2.11.0
next reply other threads:[~2018-11-02 10:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-02 10:50 Leif Lindholm [this message]
2019-02-04 12:04 ` [PATCH v2] AppPkg: fix webserver build for !Ia32/X64 Leif Lindholm
2019-02-04 15:27 ` Carsey, Jaben
2019-02-04 12:06 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181102105015.3609-1-leif.lindholm@linaro.org \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox