Module Name: src Committed By: maxv Date: Fri Mar 30 10:01:36 UTC 2018
Modified Files: src/sys/arch/amd64/amd64: genassym.cf Log Message: Fix warning when compiling Xen; FLAT_RING3_CS64 is defined in a child of xen.h, which is already included in genassym.cf. So don't redefine it. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/arch/amd64/amd64/genassym.cf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/amd64/amd64/genassym.cf diff -u src/sys/arch/amd64/amd64/genassym.cf:1.67 src/sys/arch/amd64/amd64/genassym.cf:1.68 --- src/sys/arch/amd64/amd64/genassym.cf:1.67 Thu Jan 18 07:25:34 2018 +++ src/sys/arch/amd64/amd64/genassym.cf Fri Mar 30 10:01:36 2018 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.67 2018/01/18 07:25:34 maxv Exp $ +# $NetBSD: genassym.cf,v 1.68 2018/03/30 10:01:36 maxv Exp $ # # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -358,7 +358,6 @@ define EVTCHN_UPCALL_MASK offsetof(struc define XEN_PT_BASE offsetof(struct start_info, pt_base) define XEN_NR_PT_FRAMES offsetof(struct start_info, nr_pt_frames) define __HYPERVISOR_iret __HYPERVISOR_iret -define FLAT_RING3_CS64 FLAT_RING3_CS64 endif define NKL4_KIMG_ENTRIES NKL4_KIMG_ENTRIES