Date: Mon, 8 Sep 2008 20:29:24 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 149441 for review Message-ID: <200809082029.m88KTO5D005302@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=149441 Change 149441 by peter@peter_overcee on 2008/09/08 20:28:31 Fix mismerge Affected files ... .. //depot/projects/hammer/sys/amd64/include/pcpu.h#33 edit .. //depot/projects/hammer/sys/i386/include/pcpu.h#19 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/pcpu.h#33 (text+ko) ==== @@ -53,7 +53,6 @@ #ifdef _KERNEL #define PCPU_MD_ALIGN __aligned(64) /* use unique cache line per entry */ -#endif #ifdef lint ==== //depot/projects/hammer/sys/i386/include/pcpu.h#19 (text+ko) ==== @@ -83,7 +83,6 @@ #ifdef _KERNEL #define PCPU_MD_ALIGN __aligned(64) /* max cache line size */ -#endif #ifdef lint
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809082029.m88KTO5D005302>