Date: Fri, 31 Aug 2012 21:24:28 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 216792 for review Message-ID: <201208312124.q7VLOSZw077274@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@216792?ac=10 Change 216792 by jhb@jhb_jhbbsd on 2012/08/31 21:23:41 Fix mismerges. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/fpu.c#27 edit .. //depot/projects/smpng/sys/i386/isa/npx.c#77 edit Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/fpu.c#27 (text+ko) ==== @@ -115,7 +115,6 @@ #define start_emulating() load_cr0(rcr0() | CR0_TS) #define stop_emulating() clts() - CTASSERT(sizeof(struct savefpu) == 512); CTASSERT(sizeof(struct xstate_hdr) == 64); CTASSERT(sizeof(struct savefpu_ymm) == 832); ==== //depot/projects/smpng/sys/i386/isa/npx.c#77 (text+ko) ==== @@ -100,6 +100,7 @@ #define fxrstor(addr) __asm __volatile("fxrstor %0" : : "m" (*(addr))) #define fxsave(addr) __asm __volatile("fxsave %0" : "=m" (*(addr))) #define stmxcsr(addr) __asm __volatile("stmxcsr %0" : : "m" (*(addr))) +#endif #else /* !(__GNUCLIKE_ASM && !lint) */ void fldcw(u_short cw);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208312124.q7VLOSZw077274>