Эх сурвалжийг харах

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
Linus Torvalds 8 жил өмнө
parent
commit
2ab704a47e

+ 1 - 1
Documentation/filesystems/vfs.txt

@@ -722,7 +722,7 @@ struct address_space_operations {
 
 
 	The second case is when a request has been made to invalidate
 	The second case is when a request has been made to invalidate
         some or all pages in an address_space.  This can happen
         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
         filesystem explicitly requesting it as nfs and 9fs do (when
         they believe the cache may be out of date with storage) by
         they believe the cache may be out of date with storage) by
         calling invalidate_inode_pages2().
         calling invalidate_inode_pages2().

+ 1 - 1
arch/x86/entry/entry_64.S

@@ -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
  *   1: already in kernel mode, don't need SWAPGS
  *   0: user gsbase is loaded, we need SWAPGS and standard preparation for return to usermode
  *   0: user gsbase is loaded, we need SWAPGS and standard preparation for return to usermode
  */
  */

+ 1 - 1
include/trace/events/irq.h

@@ -75,7 +75,7 @@ TRACE_EVENT(irq_handler_entry,
  * @ret: return value
  * @ret: return value
  *
  *
  * If the @ret value is set to IRQ_HANDLED, then we know that the corresponding
  * 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
  * 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.
  * conjunction with the irq_handler_entry to understand irq handler latencies.
  */
  */

+ 2 - 4
kernel/trace/trace_syscalls.c

@@ -610,8 +610,7 @@ static int perf_sysenter_enable(struct trace_event_call *call)
 	if (!sys_perf_refcount_enter)
 	if (!sys_perf_refcount_enter)
 		ret = register_trace_sys_enter(perf_syscall_enter, NULL);
 		ret = register_trace_sys_enter(perf_syscall_enter, NULL);
 	if (ret) {
 	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 {
 	} else {
 		set_bit(num, enabled_perf_enter_syscalls);
 		set_bit(num, enabled_perf_enter_syscalls);
 		sys_perf_refcount_enter++;
 		sys_perf_refcount_enter++;
@@ -682,8 +681,7 @@ static int perf_sysexit_enable(struct trace_event_call *call)
 	if (!sys_perf_refcount_exit)
 	if (!sys_perf_refcount_exit)
 		ret = register_trace_sys_exit(perf_syscall_exit, NULL);
 		ret = register_trace_sys_exit(perf_syscall_exit, NULL);
 	if (ret) {
 	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 {
 	} else {
 		set_bit(num, enabled_perf_exit_syscalls);
 		set_bit(num, enabled_perf_exit_syscalls);
 		sys_perf_refcount_exit++;
 		sys_perf_refcount_exit++;

+ 1 - 1
lib/Kconfig.debug

@@ -305,7 +305,7 @@ config DEBUG_SECTION_MISMATCH
 	    a larger kernel).
 	    a larger kernel).
 	  - Run the section mismatch analysis for each module/built-in.o file.
 	  - Run the section mismatch analysis for each module/built-in.o file.
 	    When we run the section mismatch analysis on vmlinux.o, we
 	    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.
 	    introduced.
 	    Running the analysis for each module/built-in.o file
 	    Running the analysis for each module/built-in.o file
 	    tells where the mismatch happens much closer to the
 	    tells where the mismatch happens much closer to the

+ 3 - 4
security/inode.c

@@ -156,12 +156,11 @@ EXPORT_SYMBOL_GPL(securityfs_create_file);
  * This function returns a pointer to a dentry if it succeeds.  This
  * This function returns a pointer to a dentry if it succeeds.  This
  * pointer must be passed to the securityfs_remove() function when the file is
  * pointer must be passed to the securityfs_remove() function when the file is
  * to be removed (no automatic cleanup happens if your module is unloaded,
  * to be removed (no automatic cleanup happens if your module is unloaded,
- * you are responsible here).  If an error occurs, %NULL will be returned.
+ * you are responsible here).  If an error occurs, the function will return
+ * the error value (via ERR_PTR).
  *
  *
  * If securityfs is not enabled in the kernel, the value %-ENODEV is
  * If securityfs is not enabled in the kernel, the value %-ENODEV is
- * returned.  It is not wise to check for this value, but rather, check for
- * %NULL or !%NULL instead as to eliminate the need for #ifdef in the calling
- * code.
+ * returned.
  */
  */
 struct dentry *securityfs_create_dir(const char *name, struct dentry *parent)
 struct dentry *securityfs_create_dir(const char *name, struct dentry *parent)
 {
 {