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

Commit 99262a3d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'virtio-for-linus' of... 

Merge tag 'virtio-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

Pull virtio updates from Rusty Russell.

* tag 'virtio-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  virtio: fix typo in comment
  virtio-mmio: Devices parameter parsing
  virtio_blk: Drop unused request tracking list
  virtio-blk: Fix hot-unplug race in remove method
  virtio: Use ida to allocate virtio index
  virtio: balloon: separate out common code between remove and freeze functions
  virtio: balloon: drop restore_common()
  9p: disconnect channel when PCI device is removed
  virtio: update documentation to v0.9.5 of spec
parents bf67f3a5 c6190804

Documentation/kernel-parameters.txt

+17 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ parameter is applicable: 
	USB	USB support is enabled.

	USBHID	USB Human Interface Device support is enabled.

	V4L	Video For Linux support is enabled.

	VMMIO   Driver for memory mapped virtio devices is enabled.

	VGA	The VGA console has been enabled.

	VT	Virtual terminal support is enabled.

	WDT	Watchdog support is enabled.
@@ -2932,6 +2933,22 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	video=		[FB] Frame buffer configuration

			See Documentation/fb/modedb.txt.



	virtio_mmio.device=

			[VMMIO] Memory mapped virtio (platform) device.



				<size>@<baseaddr>:<irq>[:<id>]

			where:

				<size>     := size (can use standard suffixes

						like K, M and G)

				<baseaddr> := physical base address

				<irq>      := interrupt number (as passed to

						request_irq())

				<id>       := (optional) platform device id

			example:

				virtio_mmio.device=1K@0x100b0000:48:7



			Can be used multiple times for multiple devices.



	vga=		[BOOT,X86-32] Select a particular video mode

			See Documentation/x86/boot.txt and

			Documentation/svga.txt.