summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-01-10 19:42:28 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2022-01-10 19:42:28 +0300
commita7ac314061375c7805e0d3a26aad6eb0c41100df (patch)
treee1bb77d417c76a7f2d17e283123f0e4b6e03a569 /include
parentbb4ed26e7e837ca3034d4105491436d54c430038 (diff)
parent733e417518a69b71061c3bafc2bf106109565eee (diff)
downloadlinux-a7ac314061375c7805e0d3a26aad6eb0c41100df.tar.xz
Merge tag 'asm-generic-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull asm-generic cleanups from Arnd Bergmann: "A few minor cleanups for cross-architecture code: Alexandre Ghiti deals with removing some leftovers from drivers and features that have been removed, and Wasin Thonkaew has a cosmetic change" * tag 'asm-generic-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: asm-generic/error-injection.h: fix a spelling mistake, and a coding style issue arch: Remove leftovers from prism54 wireless driver arch: Remove leftovers from mandatory file locking Documentation, arch: Remove leftovers from CIFS_WEAK_PW_HASH Documentation, arch: Remove leftovers from raw device
Diffstat (limited to 'include')
-rw-r--r--include/asm-generic/error-injection.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-generic/error-injection.h b/include/asm-generic/error-injection.h
index 7ddd9dc10ce9..fbca56bd9cbc 100644
--- a/include/asm-generic/error-injection.h
+++ b/include/asm-generic/error-injection.h
@@ -20,7 +20,7 @@ struct pt_regs;
#ifdef CONFIG_FUNCTION_ERROR_INJECTION
/*
- * Whitelist ganerating macro. Specify functions which can be
+ * Whitelist generating macro. Specify functions which can be
* error-injectable using this macro.
*/
#define ALLOW_ERROR_INJECTION(fname, _etype) \
@@ -29,7 +29,7 @@ static struct error_injection_entry __used \
_eil_addr_##fname = { \
.addr = (unsigned long)fname, \
.etype = EI_ETYPE_##_etype, \
- };
+ }
void override_function_with_return(struct pt_regs *regs);
#else