From 507da6a1f386676b5b085972555b3a3e46190e3d Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Thu, 5 Dec 2013 20:34:05 +0100 Subject: doc: Fix typo (acces_process_vm -> access_process_vm) Signed-off-by: Stefan Weil Signed-off-by: Jiri Kosina --- Documentation/filesystems/Locking | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/filesystems') diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking index fe7afe225381..5b0c083d7c0e 100644 --- a/Documentation/filesystems/Locking +++ b/Documentation/filesystems/Locking @@ -544,7 +544,7 @@ like the ->fault() handler, but simply return with VM_FAULT_NOPAGE, which will cause the VM to retry the fault. ->access() is called when get_user_pages() fails in -acces_process_vm(), typically used to debug a process through +access_process_vm(), typically used to debug a process through /proc/pid/mem or ptrace. This function is needed only for VM_IO | VM_PFNMAP VMAs. -- cgit v1.2.3 From 49457896d522db195a0fd6b273e5ce4c3b186c6a Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Tue, 31 Dec 2013 22:34:04 -0600 Subject: Documentation: update /proc/uptime field description /proc/uptime has two fields, update description to describe both ala http://lkml.indiana.edu/hypermail/linux/kernel/1312.3/01454.html Signed-off-by: Rob Landley Signed-off-by: Jiri Kosina --- Documentation/filesystems/proc.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/filesystems') diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index 22d89aa37218..19e10ab3d569 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt @@ -547,7 +547,7 @@ Table 1-5: Kernel info in /proc sys See chapter 2 sysvipc Info of SysVIPC Resources (msg, sem, shm) (2.4) tty Info of tty drivers - uptime System uptime + uptime Wall clock since boot, combined idle time of all cpus version Kernel version video bttv info of video resources (2.4) vmallocinfo Show vmalloced areas -- cgit v1.2.3