Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze

11 years ago · b7a809957b
parent 5935408a40 1a7ae25854
commit b7a809957b
2 changed files with 4 additions and 1 deletions
--- a/arch/microblaze/include/asm/posix_types.h
+++ b/arch/microblaze/include/asm/posix_types.h
@ -27,7 +27,11 @@ typedef int		__kernel_pid_t;
 typedef unsigned short	__kernel_ipc_pid_t;
 typedef unsigned int	__kernel_uid_t;
 typedef unsigned int	__kernel_gid_t;
+#ifdef __GNUC__
+typedef __SIZE_TYPE__  __kernel_size_t;
+#else
 typedef unsigned int	__kernel_size_t;
+#endif
 typedef int		__kernel_ssize_t;
 typedef int		__kernel_ptrdiff_t;
 typedef long		__kernel_time_t;
--- a/include/systemace.h
+++ b/include/systemace.h
@ -6,7 +6,6 @@
 *
 * SPDX-License-Identifier:	GPL-2.0+
 */
-#ident "$Id:$"

 #ifdef CONFIG_SYSTEMACE