From 601117e2d9b9df75e6977447d3fd4563f1536702 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Sun, 3 Apr 2016 11:05:27 +0000 Subject: Remove __lockbarrier() defines, unused since cpu_lock removal a few years ago. ok dlg@ --- sys/arch/i386/include/lock.h | 45 ++------------------------------------------ 1 file changed, 2 insertions(+), 43 deletions(-) (limited to 'sys/arch/i386/include') diff --git a/sys/arch/i386/include/lock.h b/sys/arch/i386/include/lock.h index 2d3c84b2e7c..6fcd36b1ec6 100644 --- a/sys/arch/i386/include/lock.h +++ b/sys/arch/i386/include/lock.h @@ -1,51 +1,10 @@ -/* $OpenBSD: lock.h,v 1.11 2015/05/30 08:41:30 kettenis Exp $ */ -/* $NetBSD: lock.h,v 1.1.2.2 2000/05/03 14:40:55 sommerfeld Exp $ */ +/* $OpenBSD: lock.h,v 1.12 2016/04/03 11:05:26 jsg Exp $ */ -/*- - * Copyright (c) 2000 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Jason R. Thorpe. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * Machine-dependent spin lock operations. - */ +/* public domain */ #ifndef _MACHINE_LOCK_H_ #define _MACHINE_LOCK_H_ -/* - * compiler barrier: prevent reordering of instructions. - * XXX something similar will move to - * or thereabouts. - * This prevents the compiler from reordering code around - * this "instruction", acting as a sequence point for code generation. - */ - -#define __lockbarrier() __asm volatile("": : :"memory") #define SPINLOCK_SPIN_HOOK __asm volatile("pause": : :"memory") #endif /* _MACHINE_LOCK_H_ */ -- cgit v1.2.3