Changeset 46c20c8 in mainline for kernel/arch/arm32/src/ras.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/arm32/src/ras.c (modified) (3 diffs)

kernel/arch/arm32/src/ras.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jakub Jermar 
+ * Copyright (c) 2009 Jakub Jermar
  * All rights reserved.
  *
@@ -44 +44 @@
 #include <arch.h>
 #include <memstr.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 uintptr_t *ras_page = NULL;
@@ -66 +66 @@
 }
 
-void ras_check(int n, istate_t *istate)
+void ras_check(unsigned int n, istate_t *istate)
 {
         uintptr_t rewrite_pc = istate->pc;