summaryrefslogtreecommitdiff
path: root/Documentation/virtual/lguest/lguest.c
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2011-08-19 16:42:01 -0700
committerJohn Stultz <john.stultz@linaro.org>2011-08-19 16:42:01 -0700
commit312effedac183148411c965e20a62e73f23979f6 (patch)
tree81e466e84e7a2ebe9ee53e5d0963dc2d3c3f7356 /Documentation/virtual/lguest/lguest.c
parentd3828df964e542533765b23f9a343657c7860e17 (diff)
parentdbf7603a92cd895b8c1017734bc30fd9a32fd933 (diff)
Merge branch 'upstream/linaro-3.0' into linaro-android-3.0linux-linaro-3.0-2011.08-0-android-1
Diffstat (limited to 'Documentation/virtual/lguest/lguest.c')
-rw-r--r--Documentation/virtual/lguest/lguest.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/virtual/lguest/lguest.c b/Documentation/virtual/lguest/lguest.c
index cd9d6af61d0..aec80e53c2d 100644
--- a/Documentation/virtual/lguest/lguest.c
+++ b/Documentation/virtual/lguest/lguest.c
@@ -2008,6 +2008,9 @@ int main(int argc, char *argv[])
/* We use a simple helper to copy the arguments separated by spaces. */
concat((char *)(boot + 1), argv+optind+2);
+ /* Set kernel alignment to 16M (CONFIG_PHYSICAL_ALIGN) */
+ boot->hdr.kernel_alignment = 0x1000000;
+
/* Boot protocol version: 2.07 supports the fields for lguest. */
boot->hdr.version = 0x207;