Now they agree between kernel, user, and Linux.  (This was motivated
by link errors in mtrace caused by disagreements between xv6 kernel
and user code, but also seems like the right thing to do.)