summaryrefslogtreecommitdiff
path: root/src/arch/arm/linux
diff options
context:
space:
mode:
authorAli Saidi <Ali.Saidi@ARM.com>2010-06-02 12:58:17 -0500
committerAli Saidi <Ali.Saidi@ARM.com>2010-06-02 12:58:17 -0500
commitd3a519ef0c810fb24a7d299c90f9a2d88e500360 (patch)
tree1178833c1d1dc6418e39d234424f238531ba8e85 /src/arch/arm/linux
parent5a6bf8301ad933d038f87f3030b00af1d775d5c9 (diff)
downloadgem5-d3a519ef0c810fb24a7d299c90f9a2d88e500360.tar.xz
ARM: Fixup native trace support and add some v7/recent stack code
Diffstat (limited to 'src/arch/arm/linux')
-rw-r--r--src/arch/arm/linux/process.cc16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/arch/arm/linux/process.cc b/src/arch/arm/linux/process.cc
index a5779d307..32d900020 100644
--- a/src/arch/arm/linux/process.cc
+++ b/src/arch/arm/linux/process.cc
@@ -1,4 +1,16 @@
/*
+ * Copyright (c) 2010 ARM Limited
+ * All rights reserved
+ *
+ * The license below extends only to copyright in the software and shall
+ * not be construed as granting a license to any other intellectual
+ * property including but not limited to intellectual property relating
+ * to a hardware implementation of the functionality of the software
+ * licensed hereunder. You may use the software subject to the license
+ * terms below provided that you ensure that this notice is replicated
+ * unmodified and in its entirety in all distributions of the software,
+ * modified or unmodified, in source code or in binary form.
+ *
* Copyright (c) 2003-2005 The Regents of The University of Michigan
* Copyright (c) 2007-2008 The Florida State University
* All rights reserved.
@@ -55,9 +67,9 @@ unameFunc(SyscallDesc *desc, int callnum, LiveProcess *process,
strcpy(name->sysname, "Linux");
strcpy(name->nodename, "m5.eecs.umich.edu");
- strcpy(name->release, "2.6.16.19");
+ strcpy(name->release, "2.6.29");
strcpy(name->version, "#1 Mon Aug 18 11:32:15 EDT 2003");
- strcpy(name->machine, "arm");
+ strcpy(name->machine, "armv7l");
name.copyOut(tc->getMemPort());
return 0;