Merge 3.19-rc5 into tty-next

We want those tty fixes in that release in this branch as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2 files changed, 2 insertions, 2 deletions

diff --git a/tools/lib/api/fs/debugfs.c b/tools/lib/api/fs/debugfs.c
index a74fba6d7743..86ea2d7b8845 100644
--- a/tools/lib/api/fs/debugfs.c
+++ b/tools/lib/api/fs/debugfs.c
@@ -67,7 +67,7 @@ int debugfs_valid_mountpoint(const char *debugfs)
 
         if (statfs(debugfs, &st_fs) < 0)
                 return -ENOENT;
-        else if (st_fs.f_type != (long) DEBUGFS_MAGIC)
+        else if ((long)st_fs.f_type != (long)DEBUGFS_MAGIC)
                 return -ENOENT;
 
         return 0;
diff --git a/tools/lib/api/fs/fs.c b/tools/lib/api/fs/fs.c
index 65d9be3f9887..128ef6332a6b 100644
--- a/tools/lib/api/fs/fs.c
+++ b/tools/lib/api/fs/fs.c
@@ -79,7 +79,7 @@ static int fs__valid_mount(const char *fs, long magic)
 
         if (statfs(fs, &st_fs) < 0)
                 return -ENOENT;
-        else if (st_fs.f_type != magic)
+        else if ((long)st_fs.f_type != magic)
                 return -ENOENT;
 
         return 0;