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

Commit 2891e8e6 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:
 "Two small cleanups"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/traps: Get rid of unnecessary preempt_disable/preempt_enable_no_resched
  x86/pci-calgary: Fix iommu_free() comparison of unsigned expression >= 0
parents 292d3867 07d495da

arch/x86/kernel/pci-calgary_64.c

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static void iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr, 


	/* were we called with bad_dma_address? */

	badend = DMA_ERROR_CODE + (EMERGENCY_PAGES * PAGE_SIZE);

	if (unlikely((dma_addr >= DMA_ERROR_CODE) && (dma_addr < badend))) {

	if (unlikely(dma_addr < badend)) {

		WARN(1, KERN_ERR "Calgary: driver tried unmapping bad DMA "

		       "address 0x%Lx\n", dma_addr);

		return;

arch/x86/kernel/traps.c

+0 −5
Original line number Diff line number Diff line
@@ -563,11 +563,9 @@ dotraplinkage void notrace do_int3(struct pt_regs *regs, long error_code) 
	 * as we may switch to the interrupt stack.

	 */

	debug_stack_usage_inc();

	preempt_disable();

	cond_local_irq_enable(regs);

	do_trap(X86_TRAP_BP, SIGTRAP, "int3", regs, error_code, NULL);

	cond_local_irq_disable(regs);

	preempt_enable_no_resched();

	debug_stack_usage_dec();

exit:

	ist_exit(regs);
@@ -742,14 +740,12 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code) 
	debug_stack_usage_inc();



	/* It's safe to allow irq's after DR6 has been saved */

	preempt_disable();

	cond_local_irq_enable(regs);



	if (v8086_mode(regs)) {

		handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,

					X86_TRAP_DB);

		cond_local_irq_disable(regs);

		preempt_enable_no_resched();

		debug_stack_usage_dec();

		goto exit;

	}
@@ -769,7 +765,6 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code) 
	if (tsk->thread.debugreg6 & (DR_STEP | DR_TRAP_BITS) || user_icebp)

		send_sigtrap(tsk, regs, error_code, si_code);

	cond_local_irq_disable(regs);

	preempt_enable_no_resched();

	debug_stack_usage_dec();



exit: