x86/cleanups for v4.11
Linus,
Please pull the latest x86-cleanups-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-cleanups-for-linus
# HEAD: 07d495dae20717b00881798ef812f7aa53ca0eb3 x86/traps: Get rid of unnecessary preempt_disable/preempt_enable_no_resched
Two small cleanups.
Thanks,
Ingo
------------------>
Alexander Kuleshov (1):
x86/traps: Get rid of unnecessary preempt_disable/preempt_enable_no_resched
Nikola Pajkovsky (1):
x86/pci-calgary: Fix iommu_free() comparison of unsigned expression >= 0
arch/x86/kernel/pci-calgary_64.c | 2 +- arch/x86/kernel/traps.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-)
arch/x86/kernel/pci-calgary_64.c +1 -1
@@ -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
@@ -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: