summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiku Voipio <riku.voipio@linaro.org>2014-02-19 12:59:58 +0200
committerRiku Voipio <riku.voipio@linaro.org>2014-05-02 21:59:36 +0300
commit18cb008865d078c30f8efcd28c774788ae13d6a3 (patch)
tree4b8f59ecb7b76c080317a98f49f167a7cb0fed43
parent7af03928b1194befa1ad12e25b0e53e6770ba18c (diff)
downloadqemu-18cb008865d078c30f8efcd28c774788ae13d6a3.tar.gz
qemu-18cb008865d078c30f8efcd28c774788ae13d6a3.tar.bz2
qemu-18cb008865d078c30f8efcd28c774788ae13d6a3.zip
linux-user: rename cpu-uname -> uname
To move more uname related functions out of syscall.c, rename cpu-uname.{c,h} to uname.{c.h} Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
-rw-r--r--linux-user/Makefile.objs2
-rw-r--r--linux-user/syscall.c2
-rw-r--r--linux-user/uname.c (renamed from linux-user/cpu-uname.c)2
-rw-r--r--linux-user/uname.h (renamed from linux-user/cpu-uname.h)0
4 files changed, 3 insertions, 3 deletions
diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs
index 5899d72d3e..fd5021788f 100644
--- a/linux-user/Makefile.objs
+++ b/linux-user/Makefile.objs
@@ -1,5 +1,5 @@
obj-y = main.o syscall.o strace.o mmap.o signal.o \
- elfload.o linuxload.o uaccess.o cpu-uname.o
+ elfload.o linuxload.o uaccess.o uname.o
obj-$(TARGET_HAS_BFLT) += flatload.o
obj-$(TARGET_I386) += vm86.o
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index af0bb3565c..0f4a092a70 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -110,7 +110,7 @@ int __clone2(int (*fn)(void *), void *child_stack_base,
#include <linux/filter.h>
#include <linux/blkpg.h>
#include "linux_loop.h"
-#include "cpu-uname.h"
+#include "uname.h"
#include "qemu.h"
diff --git a/linux-user/cpu-uname.c b/linux-user/uname.c
index 5db6e89567..26e90e5792 100644
--- a/linux-user/cpu-uname.c
+++ b/linux-user/uname.c
@@ -21,7 +21,7 @@
#include "qemu.h"
//#include "qemu-common.h"
-#include "cpu-uname.h"
+#include "uname.h"
/* return highest utsname machine name for emulated instruction set
*
diff --git a/linux-user/cpu-uname.h b/linux-user/uname.h
index 32492de71a..32492de71a 100644
--- a/linux-user/cpu-uname.h
+++ b/linux-user/uname.h