Commit 2ab704a4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ddc4e6d2 d282b9c0

Documentation/filesystems/vfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -722,7 +722,7 @@ struct address_space_operations { 


	The second case is when a request has been made to invalidate

        some or all pages in an address_space.  This can happen

        through the fadvice(POSIX_FADV_DONTNEED) system call or by the

        through the fadvise(POSIX_FADV_DONTNEED) system call or by the

        filesystem explicitly requesting it as nfs and 9fs do (when

        they believe the cache may be out of date with storage) by

        calling invalidate_inode_pages2().

arch/x86/entry/entry_64.S

+1 −1
Original line number Diff line number Diff line
@@ -1148,7 +1148,7 @@ END(error_entry) 




/*

 * On entry, EBS is a "return to kernel mode" flag:

 * On entry, EBX is a "return to kernel mode" flag:

 *   1: already in kernel mode, don't need SWAPGS

 *   0: user gsbase is loaded, we need SWAPGS and standard preparation for return to usermode

 */

include/trace/events/irq.h

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ TRACE_EVENT(irq_handler_entry, 
 * @ret: return value

 *

 * If the @ret value is set to IRQ_HANDLED, then we know that the corresponding

 * @action->handler scuccessully handled this irq. Otherwise, the irq might be

 * @action->handler successfully handled this irq. Otherwise, the irq might be

 * a shared irq line, or the irq was not handled successfully. Can be used in

 * conjunction with the irq_handler_entry to understand irq handler latencies.

 */

kernel/trace/trace_syscalls.c

+2 −4
Original line number Diff line number Diff line
@@ -610,8 +610,7 @@ static int perf_sysenter_enable(struct trace_event_call *call) 
	if (!sys_perf_refcount_enter)

		ret = register_trace_sys_enter(perf_syscall_enter, NULL);

	if (ret) {

		pr_info("event trace: Could not activate"

				"syscall entry trace point");

		pr_info("event trace: Could not activate syscall entry trace point");

	} else {

		set_bit(num, enabled_perf_enter_syscalls);

		sys_perf_refcount_enter++;
@@ -682,8 +681,7 @@ static int perf_sysexit_enable(struct trace_event_call *call) 
	if (!sys_perf_refcount_exit)

		ret = register_trace_sys_exit(perf_syscall_exit, NULL);

	if (ret) {

		pr_info("event trace: Could not activate"

				"syscall exit trace point");

		pr_info("event trace: Could not activate syscall exit trace point");

	} else {

		set_bit(num, enabled_perf_exit_syscalls);

		sys_perf_refcount_exit++;

lib/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ config DEBUG_SECTION_MISMATCH 
	    a larger kernel).

	  - Run the section mismatch analysis for each module/built-in.o file.

	    When we run the section mismatch analysis on vmlinux.o, we

	    lose valueble information about where the mismatch was

	    lose valuable information about where the mismatch was

	    introduced.

	    Running the analysis for each module/built-in.o file

	    tells where the mismatch happens much closer to the

CRA Git | Maintained and supported by SUSTech CRA and CCSE