Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 312a4661 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 6e54df00 4b1bacab

arch/x86/crypto/cast5_avx_glue.c

+1 −1
Original line number Diff line number Diff line 
/*

 * Glue Code for the AVX assembler implemention of the Cast5 Cipher

 * Glue Code for the AVX assembler implementation of the Cast5 Cipher

 *

 * Copyright (C) 2012 Johannes Goetzfried

 *     <Johannes.Goetzfried@informatik.stud.uni-erlangen.de>

arch/x86/crypto/cast6_avx_glue.c

+1 −1
Original line number Diff line number Diff line 
/*

 * Glue Code for the AVX assembler implemention of the Cast6 Cipher

 * Glue Code for the AVX assembler implementation of the Cast6 Cipher

 *

 * Copyright (C) 2012 Johannes Goetzfried

 *     <Johannes.Goetzfried@informatik.stud.uni-erlangen.de>

arch/x86/entry/common.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags) 
	/*

	 * In order to return to user mode, we need to have IRQs off with

	 * none of EXIT_TO_USERMODE_LOOP_FLAGS set.  Several of these flags

	 * can be set at any time on preemptable kernels if we have IRQs on,

	 * can be set at any time on preemptible kernels if we have IRQs on,

	 * so we need to loop.  Disabling preemption wouldn't help: doing the

	 * work to clear some of the flags can sleep.

	 */

arch/x86/entry/vdso/vma.c

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ int map_vdso_once(const struct vdso_image *image, unsigned long addr) 
	 * abusing from userspace install_speciall_mapping, which may

	 * not do accounting and rlimit right.

	 * We could search vma near context.vdso, but it's a slowpath,

	 * so let's explicitely check all VMAs to be completely sure.

	 * so let's explicitly check all VMAs to be completely sure.

	 */

	for (vma = mm->mmap; vma; vma = vma->vm_next) {

		if (vma_is_special_mapping(vma, &vdso_mapping) ||

arch/x86/events/intel/bts.c

+1 −1
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ static __init int bts_init(void) 
		 * the AUX buffer.

		 *

		 * However, since this driver supports per-CPU and per-task inherit

		 * we cannot use the user mapping since it will not be availble

		 * we cannot use the user mapping since it will not be available

		 * if we're not running the owning process.

		 *

		 * With PTI we can't use the kernal map either, because its not