[folded-merged] fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix-fix
has been removed from the -mm tree.  Its filename was
     fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix-fix.patch

This patch was dropped because it was folded into fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void.patch

------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix-fix

fix drivers/iommu/omap-iommu-debug.c for fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void.patch

Cc: Mark Brown <broonie@xxxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Joe Perches <joe@xxxxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Joerg Roedel <jroedel@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/iommu/omap-iommu-debug.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff -puN drivers/iommu/omap-iommu-debug.c~fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix-fix drivers/iommu/omap-iommu-debug.c
--- a/drivers/iommu/omap-iommu-debug.c~fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix-fix
+++ a/drivers/iommu/omap-iommu-debug.c
@@ -135,8 +135,9 @@ __dump_tlb_entries(struct omap_iommu *ob
 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)
_

Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are

fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void.patch
revert-ocfs2-dlm-use-list_for_each_entry-instead-of-list_for_each.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux