Skip to content

Commit 2ab704a

Browse files
committed
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
2 parents ddc4e6d + d282b9c commit 2ab704a

File tree

6 files changed

+9
-12
lines changed

6 files changed

+9
-12
lines changed

Documentation/filesystems/vfs.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ struct address_space_operations {
722722

723723
The second case is when a request has been made to invalidate
724724
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
726726
filesystem explicitly requesting it as nfs and 9fs do (when
727727
they believe the cache may be out of date with storage) by
728728
calling invalidate_inode_pages2().

arch/x86/entry/entry_64.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -1148,7 +1148,7 @@ END(error_entry)
11481148

11491149

11501150
/*
1151-
* On entry, EBS is a "return to kernel mode" flag:
1151+
* On entry, EBX is a "return to kernel mode" flag:
11521152
* 1: already in kernel mode, don't need SWAPGS
11531153
* 0: user gsbase is loaded, we need SWAPGS and standard preparation for return to usermode
11541154
*/

include/trace/events/irq.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ TRACE_EVENT(irq_handler_entry,
7575
* @ret: return value
7676
*
7777
* 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
7979
* a shared irq line, or the irq was not handled successfully. Can be used in
8080
* conjunction with the irq_handler_entry to understand irq handler latencies.
8181
*/

kernel/trace/trace_syscalls.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -610,8 +610,7 @@ static int perf_sysenter_enable(struct trace_event_call *call)
610610
if (!sys_perf_refcount_enter)
611611
ret = register_trace_sys_enter(perf_syscall_enter, NULL);
612612
if (ret) {
613-
pr_info("event trace: Could not activate"
614-
"syscall entry trace point");
613+
pr_info("event trace: Could not activate syscall entry trace point");
615614
} else {
616615
set_bit(num, enabled_perf_enter_syscalls);
617616
sys_perf_refcount_enter++;
@@ -682,8 +681,7 @@ static int perf_sysexit_enable(struct trace_event_call *call)
682681
if (!sys_perf_refcount_exit)
683682
ret = register_trace_sys_exit(perf_syscall_exit, NULL);
684683
if (ret) {
685-
pr_info("event trace: Could not activate"
686-
"syscall exit trace point");
684+
pr_info("event trace: Could not activate syscall exit trace point");
687685
} else {
688686
set_bit(num, enabled_perf_exit_syscalls);
689687
sys_perf_refcount_exit++;

lib/Kconfig.debug

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ config DEBUG_SECTION_MISMATCH
305305
a larger kernel).
306306
- Run the section mismatch analysis for each module/built-in.o file.
307307
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
309309
introduced.
310310
Running the analysis for each module/built-in.o file
311311
tells where the mismatch happens much closer to the

security/inode.c

+3-4
Original file line numberDiff line numberDiff line change
@@ -156,12 +156,11 @@ EXPORT_SYMBOL_GPL(securityfs_create_file);
156156
* This function returns a pointer to a dentry if it succeeds. This
157157
* pointer must be passed to the securityfs_remove() function when the file is
158158
* 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).
160161
*
161162
* 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-
* %NULL or !%NULL instead as to eliminate the need for #ifdef in the calling
164-
* code.
163+
* returned.
165164
*/
166165
struct dentry *securityfs_create_dir(const char *name, struct dentry *parent)
167166
{

0 commit comments

Comments
 (0)