Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f6a1238 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus 

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  lguest: allow booting guest with CONFIG_RELOCATABLE=y
  virtio: Add text copy of spec to Documentation/virtual.
parents 6f02bfc4 e22a5398

Documentation/virtual/00-INDEX

+3 −0
Original line number Diff line number Diff line
@@ -8,3 +8,6 @@ lguest/ 
	- Extremely simple hypervisor for experimental/educational use.

uml/

	- User Mode Linux, builds/runs Linux kernel as a userspace program.

virtio.txt

	- Text version of draft virtio spec.

          See http://ozlabs.org/~rusty/virtio-spec

Documentation/virtual/lguest/lguest.c

+3 −0
Original line number Diff line number Diff line
@@ -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);



	/* 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;

Documentation/virtual/virtio-spec.txt

0 → 100644
+2200 −0

File added.

Preview size limit exceeded, changes collapsed.