diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2012-10-29 17:15:32 -0400 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-10-29 17:15:32 -0400 |
| commit | 19bf7f8ac3f8131100027281c495dbbe00cd5ae0 (patch) | |
| tree | 270b97e3ca47c0f62a1babca2ae37f79a76a309c /Documentation/virtual | |
| parent | 787c57c0fb393fe8a3974d300ddcfe30373386fe (diff) | |
| parent | 35fd3dc58da675d659513384221349ef90749a01 (diff) | |
Merge remote-tracking branch 'master' into queue
Merge reason: development work has dependency on kvm patches merged
upstream.
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/asm/kvm_para.h
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'Documentation/virtual')
| -rw-r--r-- | Documentation/virtual/uml/UserModeLinux-HOWTO.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/virtual/uml/UserModeLinux-HOWTO.txt b/Documentation/virtual/uml/UserModeLinux-HOWTO.txt index 77dfecf4e2d6..a5f8436753e7 100644 --- a/Documentation/virtual/uml/UserModeLinux-HOWTO.txt +++ b/Documentation/virtual/uml/UserModeLinux-HOWTO.txt | |||
| @@ -3591,7 +3591,7 @@ | |||
| 3591 | 3591 | ||
| 3592 | 3592 | ||
| 3593 | Looking at the source shows that the fault happened during a call to | 3593 | Looking at the source shows that the fault happened during a call to |
| 3594 | copy_to_user to copy the data into the kernel: | 3594 | copy_from_user to copy the data into the kernel: |
| 3595 | 3595 | ||
| 3596 | 3596 | ||
| 3597 | 107 count -= chars; | 3597 | 107 count -= chars; |