diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-12 04:34:09 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-12 04:34:09 +0200 |
| commit | 01b0c014eeb0bb857a5dc572cd108be7becddfe7 (patch) | |
| tree | d6f1a089081aadb09e66add27f7c5137d076ac80 /drivers | |
| parent | ARCv2: [axs103_smp] Reduce clk for SMP FPGA configs (diff) | |
| parent | revert "ocfs2/dlm: use list_for_each_entry instead of list_for_each" (diff) | |
| download | linux-01b0c014eeb0bb857a5dc572cd108be7becddfe7.tar.xz linux-01b0c014eeb0bb857a5dc572cd108be7becddfe7.zip | |
Merge branch 'akpm' (patches from Andrew)
Merge fourth patch-bomb from Andrew Morton:
- sys_membarier syscall
- seq_file interface changes
- a few misc fixups
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
revert "ocfs2/dlm: use list_for_each_entry instead of list_for_each"
mm/early_ioremap: add explicit #include of asm/early_ioremap.h
fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void
selftests: enhance membarrier syscall test
selftests: add membarrier syscall test
sys_membarrier(): system-wide memory barrier (generic, x86)
MODSIGN: fix a compilation warning in extract-cert
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/iommu/omap-iommu-debug.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c index 0717aa96ce39..9bc20e2119a3 100644 --- a/drivers/iommu/omap-iommu-debug.c +++ b/drivers/iommu/omap-iommu-debug.c @@ -135,8 +135,9 @@ __dump_tlb_entries(struct omap_iommu *obj, struct cr_regs *crs, int num) static ssize_t iotlb_dump_cr(struct omap_iommu *obj, struct cr_regs *cr, struct seq_file *s) { - return seq_printf(s, "%08x %08x %01x\n", cr->cam, cr->ram, + seq_printf(s, "%08x %08x %01x\n", cr->cam, cr->ram, (cr->cam & MMU_CAM_P) ? 1 : 0); + return 0; } static size_t omap_dump_tlb_entries(struct omap_iommu *obj, struct seq_file *s) |