diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-07 15:24:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-07 15:24:08 -0400 |
commit | 2ab704a47e0f27df758840a589aec3298dbb98dd (patch) | |
tree | 6df76c8e361b41373aedd3350a668b8381f72368 | |
parent | ddc4e6d232d6b625a5686ec1aafe42b9e0109a4c (diff) | |
parent | d282b9c0ac9f7fb5dff5b146e37cf820c610dacc (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial updates from Jiri Kosina:
"The usual rocket science from the trivial tree"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
tracing/syscalls: fix multiline in error message text
lib/Kconfig.debug: fix DEBUG_SECTION_MISMATCH description
doc: vfs: fix fadvise() sycall name
x86/entry: spell EBX register correctly in documentation
securityfs: fix securityfs_create_dir comment
irq: Fix typo in tracepoint.xml
-rw-r--r-- | Documentation/filesystems/vfs.txt | 2 | ||||
-rw-r--r-- | arch/x86/entry/entry_64.S | 2 | ||||
-rw-r--r-- | include/trace/events/irq.h | 2 | ||||
-rw-r--r-- | kernel/trace/trace_syscalls.c | 6 | ||||
-rw-r--r-- | lib/Kconfig.debug | 2 | ||||
-rw-r--r-- | security/inode.c | 7 |
6 files changed, 9 insertions, 12 deletions
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt index 9ace359d6cc5..cbec006e10e4 100644 --- a/Documentation/filesystems/vfs.txt +++ b/Documentation/filesystems/vfs.txt | |||
@@ -722,7 +722,7 @@ struct address_space_operations { | |||
722 | 722 | ||
723 | The second case is when a request has been made to invalidate | 723 | The second case is when a request has been made to invalidate |
724 | some or all pages in an address_space. This can happen | 724 | some or all pages in an address_space. This can happen |
725 | through the fadvice(POSIX_FADV_DONTNEED) system call or by the | 725 | through the fadvise(POSIX_FADV_DONTNEED) system call or by the |
726 | filesystem explicitly requesting it as nfs and 9fs do (when | 726 | filesystem explicitly requesting it as nfs and 9fs do (when |
727 | they believe the cache may be out of date with storage) by | 727 | they believe the cache may be out of date with storage) by |
728 | calling invalidate_inode_pages2(). | 728 | calling invalidate_inode_pages2(). |
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index fee1d95902b5..c98ec2efd750 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S | |||
@@ -1148,7 +1148,7 @@ END(error_entry) | |||
1148 | 1148 | ||
1149 | 1149 | ||
1150 | /* | 1150 | /* |
1151 | * On entry, EBS is a "return to kernel mode" flag: | 1151 | * On entry, EBX is a "return to kernel mode" flag: |
1152 | * 1: already in kernel mode, don't need SWAPGS | 1152 | * 1: already in kernel mode, don't need SWAPGS |
1153 | * 0: user gsbase is loaded, we need SWAPGS and standard preparation for return to usermode | 1153 | * 0: user gsbase is loaded, we need SWAPGS and standard preparation for return to usermode |
1154 | */ | 1154 | */ |
diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h index f95f25e786ef..1c41b74581f7 100644 --- a/include/trace/events/irq.h +++ b/include/trace/events/irq.h | |||
@@ -75,7 +75,7 @@ TRACE_EVENT(irq_handler_entry, | |||
75 | * @ret: return value | 75 | * @ret: return value |
76 | * | 76 | * |
77 | * If the @ret value is set to IRQ_HANDLED, then we know that the corresponding | 77 | * If the @ret value is set to IRQ_HANDLED, then we know that the corresponding |
78 | * @action->handler scuccessully handled this irq. Otherwise, the irq might be | 78 | * @action->handler successfully handled this irq. Otherwise, the irq might be |
79 | * a shared irq line, or the irq was not handled successfully. Can be used in | 79 | * a shared irq line, or the irq was not handled successfully. Can be used in |
80 | * conjunction with the irq_handler_entry to understand irq handler latencies. | 80 | * conjunction with the irq_handler_entry to understand irq handler latencies. |
81 | */ | 81 | */ |
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index b2b6efc083a4..5e10395da88e 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c | |||
@@ -610,8 +610,7 @@ static int perf_sysenter_enable(struct trace_event_call *call) | |||
610 | if (!sys_perf_refcount_enter) | 610 | if (!sys_perf_refcount_enter) |
611 | ret = register_trace_sys_enter(perf_syscall_enter, NULL); | 611 | ret = register_trace_sys_enter(perf_syscall_enter, NULL); |
612 | if (ret) { | 612 | if (ret) { |
613 | pr_info("event trace: Could not activate" | 613 | pr_info("event trace: Could not activate syscall entry trace point"); |
614 | "syscall entry trace point"); | ||
615 | } else { | 614 | } else { |
616 | set_bit(num, enabled_perf_enter_syscalls); | 615 | set_bit(num, enabled_perf_enter_syscalls); |
617 | sys_perf_refcount_enter++; | 616 | sys_perf_refcount_enter++; |
@@ -682,8 +681,7 @@ static int perf_sysexit_enable(struct trace_event_call *call) | |||
682 | if (!sys_perf_refcount_exit) | 681 | if (!sys_perf_refcount_exit) |
683 | ret = register_trace_sys_exit(perf_syscall_exit, NULL); | 682 | ret = register_trace_sys_exit(perf_syscall_exit, NULL); |
684 | if (ret) { | 683 | if (ret) { |
685 | pr_info("event trace: Could not activate" | 684 | pr_info("event trace: Could not activate syscall exit trace point"); |
686 | "syscall exit trace point"); | ||
687 | } else { | 685 | } else { |
688 | set_bit(num, enabled_perf_exit_syscalls); | 686 | set_bit(num, enabled_perf_exit_syscalls); |
689 | sys_perf_refcount_exit++; | 687 | sys_perf_refcount_exit++; |
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index cab7405f48d2..39d07e754822 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
@@ -305,7 +305,7 @@ config DEBUG_SECTION_MISMATCH | |||
305 | a larger kernel). | 305 | a larger kernel). |
306 | - Run the section mismatch analysis for each module/built-in.o file. | 306 | - Run the section mismatch analysis for each module/built-in.o file. |
307 | When we run the section mismatch analysis on vmlinux.o, we | 307 | When we run the section mismatch analysis on vmlinux.o, we |
308 | lose valueble information about where the mismatch was | 308 | lose valuable information about where the mismatch was |
309 | introduced. | 309 | introduced. |
310 | Running the analysis for each module/built-in.o file | 310 | Running the analysis for each module/built-in.o file |
311 | tells where the mismatch happens much closer to the | 311 | tells where the mismatch happens much closer to the |
diff --git a/security/inode.c b/security/inode.c index e3df905ab5b1..acc3e9c8d5a7 100644 --- a/security/inode.c +++ b/security/inode.c | |||
@@ -156,12 +156,11 @@ EXPORT_SYMBOL_GPL(securityfs_create_file); | |||
156 | * This function returns a pointer to a dentry if it succeeds. This | 156 | * This function returns a pointer to a dentry if it succeeds. This |
157 | * pointer must be passed to the securityfs_remove() function when the file is | 157 | * pointer must be passed to the securityfs_remove() function when the file is |
158 | * to be removed (no automatic cleanup happens if your module is unloaded, | 158 | * to be removed (no automatic cleanup happens if your module is unloaded, |
159 | * you are responsible here). If an error occurs, %NULL will be returned. | 159 | * you are responsible here). If an error occurs, the function will return |
160 | * the error value (via ERR_PTR). | ||
160 | * | 161 | * |
161 | * If securityfs is not enabled in the kernel, the value %-ENODEV is | 162 | * If securityfs is not enabled in the kernel, the value %-ENODEV is |
162 | * returned. It is not wise to check for this value, but rather, check for | 163 | * returned. |
163 | * %NULL or !%NULL instead as to eliminate the need for #ifdef in the calling | ||
164 | * code. | ||
165 | */ | 164 | */ |
166 | struct dentry *securityfs_create_dir(const char *name, struct dentry *parent) | 165 | struct dentry *securityfs_create_dir(const char *name, struct dentry *parent) |
167 | { | 166 | { |