git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-spinlocks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
Documentation
/
virtual
/
lguest
/
lguest.c
diff --git
a/Documentation/virtual/lguest/lguest.c
b/Documentation/virtual/lguest/lguest.c
index
043bd7d
..
c095d79
100644
(file)
--- a/
Documentation/virtual/lguest/lguest.c
+++ b/
Documentation/virtual/lguest/lguest.c
@@
-436,7
+436,7
@@
static unsigned long load_bzimage(int fd)
/*
* Go back to the start of the file and read the header. It should be
/*
* Go back to the start of the file and read the header. It should be
- * a Linux boot header (see Documentation/x86/
i386/
boot.txt)
+ * a Linux boot header (see Documentation/x86/boot.txt)
*/
lseek(fd, 0, SEEK_SET);
read(fd, &boot, sizeof(boot));
*/
lseek(fd, 0, SEEK_SET);
read(fd, &boot, sizeof(boot));
@@
-1996,6
+1996,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);
/* 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;
/* Boot protocol version: 2.07 supports the fields for lguest. */
boot->hdr.version = 0x207;