Merge remote-tracking branch 'remotes/riku/for-2.0' into staging

* remotes/riku/for-2.0: linux-user: Correct DLINFO_ITEMS Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
qemu · Mar 26, 2014 · db237e3 · db237e3
2 parents 61898bc + ad1c7e0
commit db237e3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
@@ -1076,7 +1076,7 @@ struct exec
 #define TARGET_ELF_PAGESTART(_v) ((_v) & ~(unsigned long)(TARGET_ELF_EXEC_PAGESIZE-1))
 #define TARGET_ELF_PAGEOFFSET(_v) ((_v) & (TARGET_ELF_EXEC_PAGESIZE-1))
 
-#define DLINFO_ITEMS 13
+#define DLINFO_ITEMS 14
 
 static inline void memcpy_fromfs(void * to, const void * from, unsigned long n)
 {