Merge branch 'riscv' of g.csail.mit.edu:xv6-dev into riscv
This commit is contained in:
commit
7d573bae2a
|
@ -39,7 +39,7 @@ freerange(void *pa_start, void *pa_end)
|
||||||
kfree(p);
|
kfree(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Free the page of physical memory pointed at by v,
|
// Free the page of physical memory pointed at by pa,
|
||||||
// which normally should have been returned by a
|
// which normally should have been returned by a
|
||||||
// call to kalloc(). (The exception is when
|
// call to kalloc(). (The exception is when
|
||||||
// initializing the allocator; see kinit above.)
|
// initializing the allocator; see kinit above.)
|
||||||
|
|
|
@ -109,6 +109,7 @@ printf(char *fmt, ...)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
va_end(ap);
|
||||||
|
|
||||||
if(locking)
|
if(locking)
|
||||||
release(&pr.lock);
|
release(&pr.lock);
|
||||||
|
|
|
@ -42,7 +42,7 @@ uint ialloc(ushort type);
|
||||||
void iappend(uint inum, void *p, int n);
|
void iappend(uint inum, void *p, int n);
|
||||||
void die(const char *);
|
void die(const char *);
|
||||||
|
|
||||||
// convert to intel byte order
|
// convert to riscv byte order
|
||||||
ushort
|
ushort
|
||||||
xshort(ushort x)
|
xshort(ushort x)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue