Make spinlock.name a const char*

2cd67e63 · Silas Boyd-Wickizer · 76c882f1 · 2cd67e63 · 2cd67e63 · 2cd67e63
--- a/condvar.c
+++ b/condvar.c
@@ -131,7 +131,7 @@ cv_wakeup(struct condvar *cv)
 }

 void
-initcondvar(struct condvar *cv, char *n)
+initcondvar(struct condvar *cv, const char *n)
 {
  initlock(&cv->lock, n);
  LIST_INIT(&cv->waiters);

--- a/kernel.h
+++ b/kernel.h
@@ -45,7 +45,7 @@ void            cgaputc(int c);
 extern u64 ticks;
 extern struct spinlock tickslock;
 extern struct condvar cv_ticks;
-void            initcondvar(struct condvar *, char *);
+void            initcondvar(struct condvar *, const char *);
 void            cv_sleep(struct condvar *cv, struct spinlock*);
 void            cv_sleepto(struct condvar *cv, struct spinlock*, u64);
 void            cv_wakeup(struct condvar *cv);
@@ -266,7 +266,7 @@ void            acquire(struct spinlock*);
 int             tryacquire(struct spinlock*);
 void            getcallerpcs(void*, uptr*);
 int             holding(struct spinlock*);
-void            initlock(struct spinlock*, char*);
+void            initlock(struct spinlock*, const char*);
 void            release(struct spinlock*);
 void            pushcli(void);
 void            popcli(void);

--- a/spinlock.c
+++ b/spinlock.c
@@ -9,7 +9,7 @@
 #include "mtrace.h"

 void
-initlock(struct spinlock *lk, char *name)
+initlock(struct spinlock *lk, const char *name)
 {
 #if SPINLOCK_DEBUG
  lk->name = name;

--- a/spinlock.h
+++ b/spinlock.h
@@ -8,7 +8,7 @@ struct spinlock {

 #if SPINLOCK_DEBUG
  // For debugging:
-  char *name;        // Name of lock.
+  const char *name;  // Name of lock.
  struct cpu *cpu;   // The cpu holding the lock.
  uptr pcs[10];      // The call stack (an array of program counters)
                     // that locked the lock.