move memory_read_from_buffer() from fs.h to string.h

James Bottomley warns that inclusion of linux/fs.h in a low level
driver was always a danger signal.  This patch moves
memory_read_from_buffer() from fs.h to string.h and fixes includes in
existing memory_read_from_buffer() users.

Signed-off-by: Akinobu Mita <[email protected]>
Cc: James Bottomley <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
Cc: Zhang Rui <[email protected]>
Cc: Bob Moore <[email protected]>
Cc: Thomas Renninger <[email protected]>
Cc: Len Brown <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
index d8e3f153b29587dc144fc1e77f639242b2aa9a00..91dec448b3edcd5055112a892f1c368433bc6281 100644 (file)
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -26,6 +26,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/init.h>
+#include <linux/string.h>
 #include <asm/uaccess.h>
 
 #include <acpi/acpi_drivers.h>

diff --git a/drivers/zorro/zorro-sysfs.c b/drivers/zorro/zorro-sysfs.c
index 3da712cc7708c43986765f13e2b51880ba7aca39..5290552d2ef7e0525f12f6fecfdbecd756088e7e 100644 (file)
--- a/drivers/zorro/zorro-sysfs.c
+++ b/drivers/zorro/zorro-sysfs.c
@@ -15,7 +15,6 @@
 #include <linux/zorro.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/fs.h>
 
 #include "zorro.h"
 

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 9c2ac5c0ef5cb3db65050866694d4cf8af2c8dc3..ff54ae4933f3a48edce042ca330eec15fd5a1b87 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2006,8 +2006,6 @@ extern void simple_release_fs(struct vfsmount **mount, int *count);
 
 extern ssize_t simple_read_from_buffer(void __user *to, size_t count,
                        loff_t *ppos, const void *from, size_t available);
-extern ssize_t memory_read_from_buffer(void *to, size_t count, loff_t *ppos,
-                       const void *from, size_t available);
 
 #ifdef CONFIG_MIGRATION
 extern int buffer_migrate_page(struct address_space *,

diff --git a/include/linux/string.h b/include/linux/string.h
index efdc44593b522054dda0454f105fb0636b8ec0c2..810d80df0a1d1700956e40ededaeefe29883ab46 100644 (file)
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -111,5 +111,8 @@ extern void argv_free(char **argv);
 
 extern bool sysfs_streq(const char *s1, const char *s2);
 
+extern ssize_t memory_read_from_buffer(void *to, size_t count, loff_t *ppos,
+                       const void *from, size_t available);
+
 #endif
 #endif /* _LINUX_STRING_H_ */