aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-10-27 15:03:56 -0700
committerColin Cross <ccross@android.com>2011-10-27 15:03:56 -0700
commit60988eca1376ba564e778007cbffabebf05599e1 (patch)
treea188cdd22dc3a9d42955679dc01357bcd0d7e264 /Documentation
parent47d998a7cec61a44b9e0799301039a63fed28280 (diff)
parentbc2e7067af4c1cd074aaec71c2982e2265f7f169 (diff)
downloadkernel_samsung_tuna-60988eca1376ba564e778007cbffabebf05599e1.zip
kernel_samsung_tuna-60988eca1376ba564e778007cbffabebf05599e1.tar.gz
kernel_samsung_tuna-60988eca1376ba564e778007cbffabebf05599e1.tar.bz2
Merge branch 'linux-omap-3.0' into android-omap-3.0
Diffstat (limited to 'Documentation')
-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 cd9d6af..aec80e5 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;