My bad. I did notice but, didn't give it any thought. On Tue, Mar 21, 2017 at 12:10 AM, Thomas Klausner <[email protected]> wrote:
> On Mon, Mar 20, 2017 at 09:01:18PM -0700, pimin inwa wrote: > > Fixed that problem but now I get: > > > > m_bio.c -o uvm_bio.o > > /usr/src/sys/uvm/uvm_bio.c: In function 'ubc_fault': > > /usr/src/sys/uvm/uvm_bio.c:358:45: error: missing terminating " > character > > [-Werror] > > "out of range write: slot=%#"PRIxVADDR" > > ^ > > In file included from /usr/src/sys/sys/systm.h:427:0, > > from /usr/src/sys/sys/timevar.h:66, > > from /usr/src/sys/sys/time.h:307, > > from /usr/src/sys/sys/param.h:145, > > from /usr/src/sys/uvm/uvm_bio.c:42: > > /usr/src/sys/uvm/uvm_bio.c:357:3: error: expected expression before '<<' > > token > > <<<<<<< uvm_bio.c > > ^ > > /usr/src/sys/lib/libkern/libkern.h:275:33: note: in definition of macro > > 'KASSERTMSG' > > kern_assert(__KASSERTSTR msg, "diagnostic ", #e, \ > > ^ > > /usr/src/sys/uvm/uvm_bio.c:357:3: error: missing terminating " character > > <<<<<<< uvm_bio.c > > ^ > > /usr/src/sys/lib/libkern/libkern.h:275:33: note: in definition of macro > > 'KASSERTMSG' > > kern_assert(__KASSERTSTR msg, "diagnostic ", #e, \ > > ^ > > /usr/src/sys/uvm/uvm_bio.c:365:1: error: expected expression before '>>' > > token > > >>>>>>> 1.89 > > ^ > > cc1: all warnings being treated as errors > > > > This looks like a CVS merge result, i.e. you had local changes and the > same area was affected by a commit. > > If you don't need the changes, just remove the file and fetch it from > CVS, otherwise you'll have to compare the section between "<<<<<" and > "====" to the one between "====" and ">>>>>". > Thomas >
