Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e108526e authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds
Browse files

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: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: James Bottomley <James.Bottomley@hansenpartnership.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Bob Moore <robert.moore@intel.com>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 338b9bb3

drivers/acpi/system.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

drivers/zorro/zorro-sysfs.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/zorro.h>

#include <linux/stat.h>

#include <linux/string.h>

#include <linux/fs.h>



#include "zorro.h"

include/linux/fs.h

+0 −2
Original line number Diff line number Diff line
@@ -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 *,

include/linux/string.h

+3 −0
Original line number Diff line number Diff line
@@ -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_ */