[coreboot-gerrit] New patch to review for filo: Drop grub_memmove indirection

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14576

-gerrit

commit 4e0a3479c440013dcc86055b4c3f8c22f1843bf0
Author: Stefan Reinauer <stefan.reinauer at coreboot.org>
Date:   Mon May 2 17:57:47 2016 -0700

    Drop grub_memmove indirection
    
    Change-Id: I982f99063649947cbba5f70ce5fe9e0c61a85523
    Signed-off-by: Stefan Reinauer <stefan.reinauer at coreboot.org>
---
 fs/filesys.h       | 2 --
 fs/fsys_jfs.c      | 2 +-
 fs/fsys_reiserfs.c | 2 +-
 fs/fsys_xfs.c      | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/fs/filesys.h b/fs/filesys.h
index 2fe61a4..fea1d35 100644
--- a/fs/filesys.h
+++ b/fs/filesys.h
@@ -42,8 +42,6 @@ substring (const char *s1, const char *s2)
   return 1;
 }
 
-#define grub_memmove memmove
-
 #define MAXINT 0x7fffffff
 
 /* This is only used by fsys_* to determine if it's hard disk. If it is,
diff --git a/fs/fsys_jfs.c b/fs/fsys_jfs.c
index 2e46d93..f0d1ab6 100644
--- a/fs/fsys_jfs.c
+++ b/fs/fsys_jfs.c
@@ -291,7 +291,7 @@ jfs_dir (char *dirname)
 				return 0;
 			}
 			if (di_size < (di_mode & INLINEEA ? 256 : 128)) {
-				grub_memmove (linkbuf, inode->di_fastsymlink, di_size);
+				memmove (linkbuf, inode->di_fastsymlink, di_size);
 				n = di_size;
 			} else if (di_size < JFS_PATH_MAX - 1) {
 				filepos = 0;
diff --git a/fs/fsys_reiserfs.c b/fs/fsys_reiserfs.c
index d3de6be..2d47486 100644
--- a/fs/fsys_reiserfs.c
+++ b/fs/fsys_reiserfs.c
@@ -1030,7 +1030,7 @@ reiserfs_dir (char *dirname)
  	  
 	  /* Copy the remaining name to the end of the symlink data.
 	     Note that DIRNAME and LINKBUF may overlap! */
-	  grub_memmove (linkbuf + filemax, dirname, len+1);
+	  memmove (linkbuf + filemax, dirname, len+1);
 
 	  INFO->fileinfo.k_dir_id = dir_id;
 	  INFO->fileinfo.k_objectid = objectid;
diff --git a/fs/fsys_xfs.c b/fs/fsys_xfs.c
index c71af98..1fb479a 100644
--- a/fs/fsys_xfs.c
+++ b/fs/fsys_xfs.c
@@ -489,7 +489,7 @@ xfs_read (char *buf, int len)
 	int toread, startpos, endpos;
 
 	if (icore.di_format == XFS_DINODE_FMT_LOCAL) {
-		grub_memmove (buf, inode->di_u.di_c + filepos, len);
+		memmove (buf, inode->di_u.di_c + filepos, len);
 		filepos += len;
 		return len;
 	}