summaryrefslogtreecommitdiffstats
path: root/arch/x86/xen
diff options
context:
space:
mode:
authorLinus Torvalds2018-12-27 02:03:51 +0100
committerLinus Torvalds2018-12-27 02:03:51 +0100
commit312a466155108329c458049dc76a21ad56106960 (patch)
treed195001a1d258992820b7d7eaf1c0f7941e9de59 /arch/x86/xen
parentMerge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentx86/kprobes: Remove trampoline_handler() prototype (diff)
downloadkernel-qcow2-linux-312a466155108329c458049dc76a21ad56106960.tar.gz
kernel-qcow2-linux-312a466155108329c458049dc76a21ad56106960.tar.xz
kernel-qcow2-linux-312a466155108329c458049dc76a21ad56106960.zip
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Ingo Molnar: "Misc cleanups" * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/kprobes: Remove trampoline_handler() prototype x86/kernel: Fix more -Wmissing-prototypes warnings x86: Fix various typos in comments x86/headers: Fix -Wmissing-prototypes warning x86/process: Avoid unnecessary NULL check in get_wchan() x86/traps: Complete prototype declarations x86/mce: Fix -Wmissing-prototypes warnings x86/gart: Rewrite early_gart_iommu_check() comment
Diffstat (limited to 'arch/x86/xen')
-rw-r--r--arch/x86/xen/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index 075ed47993bb..d5f303c0e656 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -493,7 +493,7 @@ static unsigned long __init xen_foreach_remap_area(unsigned long nr_pages,
* The remap information (which mfn remap to which pfn) is contained in the
* to be remapped memory itself in a linked list anchored at xen_remap_mfn.
* This scheme allows to remap the different chunks in arbitrary order while
- * the resulting mapping will be independant from the order.
+ * the resulting mapping will be independent from the order.
*/
void __init xen_remap_memory(void)
{