xv6

commit cfcfb58be3aec4ed781701486b35ead779f2f5c5
parent 58b0dc2b55c5c43a49aad1d6408683ba128fc2db
Author: Brian Swetland <swetland@frotz.net>
Date:   Thu,  2 Jan 2014 14:01:31 -0800

make getcallerpcs() and callsites use 64bit friendly types

Diffstat:
M
include/defs.h
 | 
2
+-
M
include/spinlock.h
 | 
2
+-
M
kernel/console.c
 | 
2
+-
M
kernel/spinlock.c
 | 
2
+-

4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/defs.h b/include/defs.h
@@ -122,7 +122,7 @@ void            swtch(struct context**, struct context*);
 
 // spinlock.c
 void            acquire(struct spinlock*);
-void            getcallerpcs(void*, uint*);
+void            getcallerpcs(void*, uintp*);
 int             holding(struct spinlock*);
 void            initlock(struct spinlock*, char*);
 void            release(struct spinlock*);
diff --git a/include/spinlock.h b/include/spinlock.h
@@ -5,7 +5,7 @@ struct spinlock {
   // For debugging:
   char *name;        // Name of lock.
   struct cpu *cpu;   // The cpu holding the lock.
-  uint pcs[10];      // The call stack (an array of program counters)
+  uintp pcs[10];      // The call stack (an array of program counters)
                      // that locked the lock.
 };
 
diff --git a/kernel/console.c b/kernel/console.c
@@ -119,7 +119,7 @@ void
 panic(char *s)
 {
   int i;
-  uint pcs[10];
+  uintp pcs[10];
   
   cli();
   cons.locking = 0;
diff --git a/kernel/spinlock.c b/kernel/spinlock.c
@@ -65,7 +65,7 @@ release(struct spinlock *lk)
 
 // Record the current call stack in pcs[] by following the %ebp chain.
 void
-getcallerpcs(void *v, uint pcs[])
+getcallerpcs(void *v, uintp pcs[])
 {
   uintp *ebp;
   int i;