From 9ac8c3bd50018c80ad413bff00f054496998cc0d Mon Sep 17 00:00:00 2001 From: Yohan Pipereau Date: Sun, 8 Jul 2018 20:19:32 +0200 Subject: Documentation : Update relay function types This patch updates two callback functions provided as an example in relay API documentation : subbuf_start and create_buf_file_handler. These functions were using older and incorrect types causing an "initialization from incompatible pointer type". Signed-off-by: Yohan Pipereau Signed-off-by: Jonathan Corbet --- Documentation/filesystems/relay.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation/filesystems') diff --git a/Documentation/filesystems/relay.txt b/Documentation/filesystems/relay.txt index 33e2f3694733..cd709a94d054 100644 --- a/Documentation/filesystems/relay.txt +++ b/Documentation/filesystems/relay.txt @@ -222,7 +222,7 @@ using debugfs: */ static struct dentry *create_buf_file_handler(const char *filename, struct dentry *parent, - int mode, + umode_t mode, struct rchan_buf *buf, int *is_global) { @@ -375,7 +375,7 @@ would be very similar: static int subbuf_start(struct rchan_buf *buf, void *subbuf, void *prev_subbuf, - unsigned int prev_padding) + size_t prev_padding) { if (prev_subbuf) *((unsigned *)prev_subbuf) = prev_padding; -- cgit v1.2.3 From 655c75a206e65058c50abe731c0518fae5e25c73 Mon Sep 17 00:00:00 2001 From: Prashant Dhamdhere Date: Fri, 13 Jul 2018 22:58:06 +0530 Subject: Documentation: proc.txt: Adding 'HardwareCorrupted' field and description. Fill in missing documentation for the HardwareCorrupted field in proc.txt. Signed-off-by: Prashant Dhamdhere Signed-off-by: Jonathan Corbet --- Documentation/filesystems/proc.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Documentation/filesystems') diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index 520f6a84cf50..1605acbb23b6 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt @@ -870,6 +870,7 @@ Committed_AS: 100056 kB VmallocTotal: 112216 kB VmallocUsed: 428 kB VmallocChunk: 111088 kB +HardwareCorrupted: 0 kB AnonHugePages: 49152 kB ShmemHugePages: 0 kB ShmemPmdMapped: 0 kB @@ -915,6 +916,8 @@ MemAvailable: An estimate of how much memory is available for starting new Dirty: Memory which is waiting to get written back to the disk Writeback: Memory which is actively being written back to the disk AnonPages: Non-file backed pages mapped into userspace page tables +HardwareCorrupted: The amount of RAM/memory in KB, the kernel identifies as + corrupted. AnonHugePages: Non-file backed huge pages mapped into userspace page tables Mapped: files which have been mmaped, such as libraries Shmem: Total memory used by shared memory (shmem) and tmpfs -- cgit v1.2.3 From fe3136f441411c2aeb4ffe29ef44b1a87c116775 Mon Sep 17 00:00:00 2001 From: Souptick Joarder Date: Sun, 22 Jul 2018 18:31:34 +0530 Subject: mm: Introduce new type vm_fault_t We have introduce a new return type vm_fault_t for fault, page_mkwrite and pfn_mkwrite handlers. Update the document for the same Signed-off-by: Souptick Joarder Signed-off-by: Jonathan Corbet --- Documentation/filesystems/Locking | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Documentation/filesystems') diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking index 37bf0a9de75c..f64bbec3a8cf 100644 --- a/Documentation/filesystems/Locking +++ b/Documentation/filesystems/Locking @@ -532,9 +532,9 @@ More details about quota locking can be found in fs/dquot.c. prototypes: void (*open)(struct vm_area_struct*); void (*close)(struct vm_area_struct*); - int (*fault)(struct vm_area_struct*, struct vm_fault *); - int (*page_mkwrite)(struct vm_area_struct *, struct vm_fault *); - int (*pfn_mkwrite)(struct vm_area_struct *, struct vm_fault *); + vm_fault_t (*fault)(struct vm_area_struct*, struct vm_fault *); + vm_fault_t (*page_mkwrite)(struct vm_area_struct *, struct vm_fault *); + vm_fault_t (*pfn_mkwrite)(struct vm_area_struct *, struct vm_fault *); int (*access)(struct vm_area_struct *, unsigned long, void*, int, int); locking rules: -- cgit v1.2.3