Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit e108526e77aa41c89b3be96f75d97615db2b751c

Authored by Akinobu Mita
Committed by Linus Torvalds
1 parent 338b9bb3ad
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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 <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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 4 changed files with 4 additions and 3 deletions Side-by-side Diff

drivers/acpi/system.c
Diff comments   View file @ e108526
... ... @@ -26,6 +26,7 @@
26 26 #include <linux/proc_fs.h>
27 27 #include <linux/seq_file.h>
28 28 #include <linux/init.h>
  29 +#include <linux/string.h>
29 30 #include <asm/uaccess.h>
30 31  
31 32 #include <acpi/acpi_drivers.h>
drivers/zorro/zorro-sysfs.c
Diff comments   View file @ e108526
... ... @@ -15,7 +15,6 @@
15 15 #include <linux/zorro.h>
16 16 #include <linux/stat.h>
17 17 #include <linux/string.h>
18   -#include <linux/fs.h>
19 18  
20 19 #include "zorro.h"
21 20  
... ... @@ -2006,8 +2006,6 @@
2006 2006  
2007 2007 extern ssize_t simple_read_from_buffer(void __user *to, size_t count,
2008 2008 loff_t *ppos, const void *from, size_t available);
2009   -extern ssize_t memory_read_from_buffer(void *to, size_t count, loff_t *ppos,
2010   - const void *from, size_t available);
2011 2009  
2012 2010 #ifdef CONFIG_MIGRATION
2013 2011 extern int buffer_migrate_page(struct address_space *,
include/linux/string.h
Diff comments   View file @ e108526
... ... @@ -111,6 +111,9 @@
111 111  
112 112 extern bool sysfs_streq(const char *s1, const char *s2);
113 113  
  114 +extern ssize_t memory_read_from_buffer(void *to, size_t count, loff_t *ppos,
  115 + const void *from, size_t available);
  116 +
114 117 #endif
115 118 #endif /* _LINUX_STRING_H_ */