Merge yet again with the main repository.

2 files changed, 16 insertions, 2 deletions

diff --git a/util/hgfilesize.py b/util/hgfilesize.py
index 8b9ad67ea..8016582d3 100644
--- a/util/hgfilesize.py
+++ b/util/hgfilesize.py
@@ -23,6 +23,8 @@ def limit_file_size(ui, repo, node=None, **kwargs):
     for rev in xrange(existing_tip, new_tip + 1):
         ctx = context.changectx(repo, rev)
         for f in ctx.files():
+            if f not in ctx:
+                continue
             fctx = ctx.filectx(f)
             if fctx.size() > limit:
                 ui.write(_('file %s of %s is too large: %d > %d\n') % \
diff --git a/util/m5/m5.c b/util/m5/m5.c
index fc4f5dcae..40328bc38 100644
--- a/util/m5/m5.c
+++ b/util/m5/m5.c
@@ -1,4 +1,16 @@
 /*
+ * Copyright (c) 2011 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
  * All rights reserved.
  *
@@ -160,8 +172,8 @@ do_initparam(int argc, char *argv[])
     if (argc != 0)
         usage();
 
- 
-    printf("%ld", m5_initparam());
+    uint64_t val = m5_initparam();
+    printf("%"PRIu64, val);
 }
 
 void