From 4e9c36b3003ffcfb812ef0bea8d7504d6a422c13 Mon Sep 17 00:00:00 2001
From: markm <markm@FreeBSD.org>
Date: Sun, 11 Feb 2001 10:44:09 +0000
Subject: RIP <machine/lock.h>.

Some things needed bits of <i386/include/lock.h> - cy.c now has its
own (only) copy of the COM_(UN)LOCK() macros, and IMASK_(UN)LOCK()
has been moved to <i386/include/apic.h> (AKA <machine/apic.h>).
Reviewed by:	jhb
---
 sys/powerpc/include/lock.h       | 36 ------------------------------------
 sys/powerpc/powerpc/mp_machdep.c |  1 -
 2 files changed, 37 deletions(-)
 delete mode 100644 sys/powerpc/include/lock.h

(limited to 'sys/powerpc')

diff --git a/sys/powerpc/include/lock.h b/sys/powerpc/include/lock.h
deleted file mode 100644
index ab1e808..0000000
--- a/sys/powerpc/include/lock.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 1997, by Steve Passe
- * All rights reserved.
- *
- * 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. The name of the developer may NOT be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
- *
- * $FreeBSD$
- */
-
-#ifndef _MACHINE_LOCK_H_
-#define _MACHINE_LOCK_H_
-
-#define COM_LOCK()
-#define COM_UNLOCK()
-#define COM_DISABLE_INTR()	COM_LOCK()
-#define COM_ENABLE_INTR()	COM_UNLOCK()
-
-#endif /* !_MACHINE_LOCK_H_ */
diff --git a/sys/powerpc/powerpc/mp_machdep.c b/sys/powerpc/powerpc/mp_machdep.c
index 6a46c28..8ca5b04 100644
--- a/sys/powerpc/powerpc/mp_machdep.c
+++ b/sys/powerpc/powerpc/mp_machdep.c
@@ -43,7 +43,6 @@
 #include <sys/dkstat.h>
 
 #include <machine/smp.h>
-#include <machine/lock.h>
 #include <machine/atomic.h>
 #include <machine/globaldata.h>
 #include <machine/pmap.h>
-- 
cgit v1.1