add axfs patches to fix build errorsv3.4.25-ltsi

4 files changed, 210 insertions, 1 deletions

diff --git a/patches.axfs/axfs-fix-build-failure-due-to-undefined-symbol-axfs_xip_record.patch b/patches.axfs/axfs-fix-build-failure-due-to-undefined-symbol-axfs_xip_record.patch
new file mode 100644
index 00000000000000..34e01ec025724d
--- /dev/null
+++ b/patches.axfs/axfs-fix-build-failure-due-to-undefined-symbol-axfs_xip_record.patch
@@ -0,0 +1,85 @@
+From aaditya.kumar.30@gmail.com Fri Dec 21 15:46:49 2012
+From: Aaditya Kumar <aaditya.kumar.30@gmail.com>
+Date: Sat, 22 Dec 2012 05:16:48 +0530
+Subject: AXFS: fix build failure due to undefined symbol axfs_xip_record()
+To: Greg KH <gregkh@linuxfoundation.org>
+Cc: ltsi-dev@lists.linuxfoundation.org, tim.bird@am.sony.com,  frank.rowand@am.sony.com, takuzo.ohara@ap.sony.com, amit.agarwal@ap.sony.com,  kan.iibuchi@jp.sony.com, Aaditya Kumar <aaditya.kumar@ap.sony.com>
+Message-ID: <CAEtiSavV8fDKpY+5krVPqoMwGwB6C20rLa5Cz-gqWqJj2+rryA@mail.gmail.com>
+Status: RO
+X-Status: A
+Content-Length: 1955
+Lines: 72
+
+
+This patch fixes following build failure when axfs is compiled
+as a module. The build failure is caused by
+Commit-ID: a7e526129f6ea298513ef4ce7aa6db08fc069d14
+
+ERROR: "axfs_xip_record" [fs/axfs/axfs.ko] undefined!
+
+Signed-off-by: Aaditya Kumar <aaditya.kumar@ap.sony.com>
+
+
+---
+ fs/axfs/Makefile           |    3 +--
+ fs/axfs/axfs.h             |    2 ++
+ fs/axfs/axfs_super.c       |    4 +++-
+ fs/axfs/axfs_xip_profile.c |    9 ++++++---
+ 4 files changed, 12 insertions(+), 6 deletions(-)
+
+--- a/fs/axfs/Makefile
++++ b/fs/axfs/Makefile
+@@ -5,6 +5,5 @@
+ obj-$(CONFIG_AXFS) += axfs.o
+ 
+ axfs-y := axfs_inode.o axfs_super.o axfs_uncompress.o axfs_profiling.o \
+-          axfs_uml.o axfs_mtd.o axfs_bdev.o axfs_physmem.o
++          axfs_uml.o axfs_mtd.o axfs_bdev.o axfs_physmem.o axfs_xip_profile.o
+ 
+-obj-$(CONFIG_AXFS_DEBUG) += axfs_xip_profile.o
+--- a/fs/axfs/axfs.h
++++ b/fs/axfs/axfs.h
+@@ -93,4 +93,6 @@ void axfs_map_physmem(struct axfs_super
+ void axfs_unmap_physmem(struct super_block *);
+ #endif
+ 
++/* axfs_xip_profile.c */
++extern int __init axfs_xip_proc_profile(void);
+ #endif
+--- a/fs/axfs/axfs_super.c
++++ b/fs/axfs/axfs_super.c
+@@ -975,8 +975,10 @@ static int __init init_axfs_fs(void)
+ 
+ 	err = register_filesystem(&axfs_fs_type);
+ 
+-	if (!err)
++	if (!err) {
++		axfs_xip_proc_profile();
+ 		return 0;
++	}
+ 
+ 	axfs_uncompress_exit();
+ 	return err;
+--- a/fs/axfs/axfs_xip_profile.c
++++ b/fs/axfs/axfs_xip_profile.c
+@@ -137,7 +137,7 @@ static int axfs_xip_proc_write(struct fi
+ 	return count;
+ }
+ 
+-static int __init axfs_xip_proc_profile(void)
++int __init axfs_xip_proc_profile(void)
+ {
+ 	struct proc_dir_entry *ent;
+ 	ent = create_proc_entry("axfs_xip", S_IFREG|S_IRUGO|S_IWUSR, NULL);
+@@ -149,6 +149,9 @@ static int __init axfs_xip_proc_profile(
+ 	ent->write_proc = axfs_xip_proc_write;
+ 	return 0;
+ }
+-late_initcall(axfs_xip_proc_profile);
+-
++#else
++int __init axfs_xip_proc_profile(void)
++{
++	return 0;
++}
+ #endif /* CONFIG_AXFS_DEBUG */
diff --git a/patches.axfs/axfs-fix-build-failure-due-to-undefined-symbol-kern_path_parent.patch b/patches.axfs/axfs-fix-build-failure-due-to-undefined-symbol-kern_path_parent.patch
new file mode 100644
index 00000000000000..2569c9a658ae77
--- /dev/null
+++ b/patches.axfs/axfs-fix-build-failure-due-to-undefined-symbol-kern_path_parent.patch
@@ -0,0 +1,85 @@
+From aaditya.kumar.30@gmail.com Fri Dec 21 15:43:41 2012
+From: Aaditya Kumar <aaditya.kumar.30@gmail.com>
+Date: Sat, 22 Dec 2012 05:13:40 +0530
+Subject: AXFS: fix build failure due to undefined symbol kern_path_parent()
+To: Greg KH <gregkh@linuxfoundation.org>
+Cc: ltsi-dev@lists.linuxfoundation.org, tim.bird@am.sony.com,  frank.rowand@am.sony.com, takuzo.ohara@ap.sony.com, amit.agarwal@ap.sony.com,  kan.iibuchi@jp.sony.com, Aaditya Kumar <aaditya.kumar@ap.sony.com>
+Message-ID: <CAEtiSasvwemeCYkjeagSPb-chs=cDeNeH1jJqVRxW0qnomij8Q@mail.gmail.com>
+
+
+This patch fixes following build failure when axfs is compiled
+as a module. The build failure is caused by
+Commit-ID: a7e526129f6ea298513ef4ce7aa6db08fc069d14
+
+ERROR: "kern_path_parent" [fs/axfs/axfs.ko] undefined!
+
+Signed-off-by: Aaditya Kumar <aaditya.kumar@ap.sony.com>
+
+---
+Changes from v2:
+- Address checkpatch.pl errors.
+
+Changes from v1:
+- AXFS should not be using kernel_path() or kenel_path_parent() and
+  actually there is no need for these functions, we can do without these
+  functions also, so change the mounting code to not use it.
+
+---
+ fs/axfs/axfs_bdev.c  |   18 ------------------
+ fs/axfs/axfs_super.c |   10 ++++++----
+ 2 files changed, 6 insertions(+), 22 deletions(-)
+
+--- a/fs/axfs/axfs_bdev.c
++++ b/fs/axfs/axfs_bdev.c
+@@ -94,24 +94,6 @@ void axfs_copy_block(struct super_block
+ 	}
+ }
+ 
+-int axfs_is_dev_bdev(char *path)
+-{
+-	struct nameidata nd;
+-	int ret = false;
+-
+-	if (!path)
+-		return false;
+-	nd.flags |= LOOKUP_FOLLOW;
+-	if (kern_path_parent(path, &nd))
+-		return false;
+-
+-	if (S_ISBLK(nd.path.dentry->d_inode->i_mode))
+-		ret = true;
+-
+-	path_put(&nd.path);
+-	return ret;
+-}
+-
+ int axfs_verify_bdev_sizes(struct super_block *sb, int *err)
+ {
+ 	u64 io_dev_size;
+--- a/fs/axfs/axfs_super.c
++++ b/fs/axfs/axfs_super.c
+@@ -754,6 +754,7 @@ axfs_get_sb_address(struct file_system_t
+ {
+ 	int mtdnr;
+ 	char *sd = sbi->second_dev;
++	struct dentry *dp = NULL;
+ 
+ 	if (sbi->phys_start_addr == 0)
+ 		return false;
+@@ -767,11 +768,12 @@ axfs_get_sb_address(struct file_system_t
+ 
+ 	if (axfs_is_dev_mtd(sd, &mtdnr))
+ 		return axfs_get_sb_mtd(fs_type, flags, sd, sbi);
+-	else if (axfs_is_dev_bdev(sd))
+-		return axfs_get_sb_bdev(fs_type, flags, sd, sbi);
+-	else
+-		return mount_nodev(fs_type, flags, sbi, axfs_fill_super);
+ 
++	dp = axfs_get_sb_bdev(fs_type, flags, sd, sbi);
++	if (!IS_ERR_OR_NULL(dp))
++		return dp;
++
++	return mount_nodev(fs_type, flags, sbi, axfs_fill_super);
+ }
+ 
+ /* helpers for parse_axfs_options */
diff --git a/patches.axfs/axfs-fix-type-cast-warning-in-axfs_region_is_vmalloc.patch b/patches.axfs/axfs-fix-type-cast-warning-in-axfs_region_is_vmalloc.patch
new file mode 100644
index 00000000000000..84e1061ac7d77f
--- /dev/null
+++ b/patches.axfs/axfs-fix-type-cast-warning-in-axfs_region_is_vmalloc.patch
@@ -0,0 +1,36 @@
+From aaditya.kumar.30@gmail.com Fri Dec 21 15:55:12 2012
+From: Aaditya Kumar <aaditya.kumar.30@gmail.com>
+Date: Sat, 22 Dec 2012 05:25:10 +0530
+Subject: AXFS: fix type cast warning in axfs_region_is_vmalloc()
+To: Greg KH <gregkh@linuxfoundation.org>
+Cc: ltsi-dev@lists.linuxfoundation.org, tim.bird@am.sony.com,  frank.rowand@am.sony.com, takuzo.ohara@ap.sony.com, amit.agarwal@ap.sony.com,  kan.iibuchi@jp.sony.com, Aaditya Kumar <aaditya.kumar@ap.sony.com>
+Message-ID: <CAEtiSasb7hLcp63zjRg2gQAmYgKE-F8rKwu==T=jQAxCYQWSbQ@mail.gmail.com>
+
+
+This patch fixes following compilation warning caused by
+Commit-ID: a7e526129f6ea298513ef4ce7aa6db08fc069d14
+
+fs/axfs/axfs_inode.c: In function ‘axfs_region_is_vmalloc’:
+fs/axfs/axfs_inode.c:175:11: warning: cast from pointer to integer of

+different size [-Wpointer-to-int-cast]

+
+Signed-off-by: Aaditya Kumar <aaditya.kumar@ap.sony.com>

+---

+Changes from v1:

+ - Use unsigned long type cast.

+
+---

+ fs/axfs/axfs_inode.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fs/axfs/axfs_inode.c
++++ b/fs/axfs/axfs_inode.c
+@@ -172,7 +172,7 @@ static inline u64 axfs_get_xip_region_ph
+ static inline int axfs_region_is_vmalloc(struct axfs_super *sbi,
+ 					 struct axfs_region_desc *region)
+ {
+-	u64 va = (u32) region->virt_addr;
++	u64 va = (unsigned long) region->virt_addr;
+ 	u64 vo = (u64) region->fsoffset + (u64) sbi->virt_start_addr;
+ 
+ 	if (va == 0)
diff --git a/series b/series
index 783b8d93acae0a..7e17424e0caf55 100644
--- a/series
+++ b/series
@@ -132,7 +132,10 @@ patches.axfs/axfs-axfs_bdev.c.patch
 patches.axfs/axfs-xip-debugging-support.patch
 patches.axfs/axfs-add-documentation.patch
 patches.axfs/axfs-mount-as-rootfs.patch
-patches.axfs/axfs-mark-it-broken.patch
+#patches.axfs/axfs-mark-it-broken.patch
+patches.axfs/axfs-fix-build-failure-due-to-undefined-symbol-axfs_xip_record.patch
+patches.axfs/axfs-fix-build-failure-due-to-undefined-symbol-kern_path_parent.patch
+patches.axfs/axfs-fix-type-cast-warning-in-axfs_region_is_vmalloc.patch
 
 
 #############################################################################