diff options
| author | Colin Cross <ccross@android.com> | 2011-10-27 15:01:42 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-10-27 15:01:42 -0700 |
| commit | bc2e7067af4c1cd074aaec71c2982e2265f7f169 (patch) | |
| tree | bc8bcb97155bada3d09c91c6b8aa56ed546471a9 /Documentation | |
| parent | 4e9ff24781ab987120e792a667ba45b3d3dd51a0 (diff) | |
| parent | 97596c34030ed28657ccafddb67e17a03890b90a (diff) | |
| download | kernel_samsung_tuna-bc2e7067af4c1cd074aaec71c2982e2265f7f169.zip kernel_samsung_tuna-bc2e7067af4c1cd074aaec71c2982e2265f7f169.tar.gz kernel_samsung_tuna-bc2e7067af4c1cd074aaec71c2982e2265f7f169.tar.bz2 | |
Merge commit 'v3.0.8' into linux-omap-3.0
Conflicts:
drivers/tty/serial/omap-serial.c
drivers/usb/musb/musb_gadget.c
sound/soc/omap/omap-mcbsp.c
Change-Id: Ic31b7266dda3ac8483f737272874ebf4725b5fe3
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/virtual/lguest/lguest.c | 3 |
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; |