path: root/kernel/kexec.c
diff options
authorLinus Torvalds <>2015-02-10 18:57:15 -0800
committerLinus Torvalds <>2015-02-10 18:57:15 -0800
commit29afc4e9a408f2304e09c6dd0dbcfbd2356d0faa (patch)
treeb4065a69fc2baa5f721b9e3ca05e3934e1ea6693 /kernel/kexec.c
parent1d9c5d79e6e4385aea6f69c23ba543717434ed70 (diff)
parentedb0ec0725bb9797ded0deaf172a6795e43795c8 (diff)
Merge branch 'for-linus' of git://
Pull trivial tree changes from Jiri Kosina: "Patches from trivial.git that keep the world turning around. Mostly documentation and comment fixes, and a two corner-case code fixes from Alan Cox" * 'for-linus' of git:// kexec, Kconfig: spell "architecture" properly mm: fix cleancache debugfs directory path blackfin: mach-common: ints-priority: remove unused function doubletalk: probe failure causes OOPS ARM: cache-l2x0.c: Make it clear that cache-l2x0 handles L310 cache controller msdos_fs.h: fix 'fields' in comment scsi: aic7xxx: fix comment ARM: l2c: fix comment ibmraid: fix writeable attribute with no store method dynamic_debug: fix comment doc: usbmon: fix spelling s/unpriviledged/unprivileged/ x86: init_mem_mapping(): use capital BIOS in comment
Diffstat (limited to 'kernel/kexec.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c
index 9a8a01abbaed..c85277639b34 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -2512,7 +2512,7 @@ static int kexec_apply_relocations(struct kimage *image)
- * Respective archicture needs to provide support for applying
+ * Respective architecture needs to provide support for applying
* relocations of type SHT_RELA/SHT_REL.
if (sechdrs[i].sh_type == SHT_RELA)