tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
OMAP3: set the core dpll clk rate in its set_rate function
omap: iommu: Return IRQ_HANDLED in fault handler when no fault occured

Linus Torvalds df8d06ad 7c21738e

+3
+1
arch/arm/mach-omap2/clkt34xx_dpll3m2.c
··· 115 115 sdrc_cs0->rfr_ctrl, sdrc_cs0->actim_ctrla, 116 116 sdrc_cs0->actim_ctrlb, sdrc_cs0->mr, 117 117 0, 0, 0, 0); 118 + clk->rate = rate; 118 119 119 120 return 0; 120 121 }
+2
arch/arm/plat-omap/iommu.c
··· 793 793 clk_enable(obj->clk); 794 794 errs = iommu_report_fault(obj, &da); 795 795 clk_disable(obj->clk); 796 + if (errs == 0) 797 + return IRQ_HANDLED; 796 798 797 799 /* Fault callback or TLB/PTE Dynamic loading */ 798 800 if (obj->isr && !obj->isr(obj, da, errs, obj->isr_priv))