diff options
| author | Linus Torvalds | 2017-11-16 13:14:46 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2017-11-16 13:14:46 -0800 |
| commit | 18c83d2c0390fd0e8336ad090a047c56037d19f5 (patch) | |
| tree | 7042614cea7b22d5b0fa35ee7a4fa95124008246 /drivers/firmware | |
| parent | 051089a2eed9a9977080774f3793ff2688cd3878 (diff) | |
| parent | c1d0c3f623ada808904dec676da0126f5b800630 (diff) | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio updates from Michael Tsirkin:
"Fixes in qemu, vhost and virtio"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
fw_cfg: fix the command line module name
vhost/vsock: fix uninitialized vhost_vsock->guest_cid
vhost: fix end of range for access_ok
vhost/scsi: Use safe iteration in vhost_scsi_complete_cmd_work()
virtio_balloon: fix deadlock on OOM
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/qemu_fw_cfg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c index 0e2011636fbb..5cfe39f7a45f 100644 --- a/drivers/firmware/qemu_fw_cfg.c +++ b/drivers/firmware/qemu_fw_cfg.c @@ -10,9 +10,9 @@ * and select subsets of aarch64), a Device Tree node (on arm), or using * a kernel module (or command line) parameter with the following syntax: * - * [fw_cfg.]ioport=<size>@<base>[:<ctrl_off>:<data_off>] + * [qemu_fw_cfg.]ioport=<size>@<base>[:<ctrl_off>:<data_off>] * or - * [fw_cfg.]mmio=<size>@<base>[:<ctrl_off>:<data_off>] + * [qemu_fw_cfg.]mmio=<size>@<base>[:<ctrl_off>:<data_off>] * * where: * <size> := size of ioport or mmio range @@ -21,9 +21,9 @@ * <data_off> := (optional) offset of data register * * e.g.: - * fw_cfg.ioport=2@0x510:0:1 (the default on x86) + * qemu_fw_cfg.ioport=2@0x510:0:1 (the default on x86) * or - * fw_cfg.mmio=0xA@0x9020000:8:0 (the default on arm) + * qemu_fw_cfg.mmio=0xA@0x9020000:8:0 (the default on arm) */ #include <linux/module.h> |