Mon Jul 6 10:50:32 2020 UTC ()
Drop unused opt_lockdebug.h.


(rin)
diff -r1.111 -r1.112 src/sys/arch/powerpc/include/cpu.h
cvs diff -r1.111 -r1.112 src/sys/arch/powerpc/include/cpu.h (expand / switch to unified diff)

--- src/sys/arch/powerpc/include/cpu.h 2020/06/27 07:33:51 1.111
+++ src/sys/arch/powerpc/include/cpu.h 2020/07/06 10:50:32 1.112
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: cpu.h,v 1.111 2020/06/27 07:33:51 macallan Exp $ */ 1/* $NetBSD: cpu.h,v 1.112 2020/07/06 10:50:32 rin Exp $ */
2 2
3/* 3/*
4 * Copyright (C) 1999 Wolfgang Solfrank. 4 * Copyright (C) 1999 Wolfgang Solfrank.
5 * Copyright (C) 1999 TooLs GmbH. 5 * Copyright (C) 1999 TooLs GmbH.
6 * Copyright (C) 1995-1997 Wolfgang Solfrank. 6 * Copyright (C) 1995-1997 Wolfgang Solfrank.
7 * Copyright (C) 1995-1997 TooLs GmbH. 7 * Copyright (C) 1995-1997 TooLs GmbH.
8 * All rights reserved. 8 * All rights reserved.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -35,27 +35,26 @@ @@ -35,27 +35,26 @@
35 35
36#ifndef _POWERPC_CPU_H_ 36#ifndef _POWERPC_CPU_H_
37#define _POWERPC_CPU_H_ 37#define _POWERPC_CPU_H_
38 38
39struct cache_info { 39struct cache_info {
40 int dcache_size; 40 int dcache_size;
41 int dcache_line_size; 41 int dcache_line_size;
42 int icache_size; 42 int icache_size;
43 int icache_line_size; 43 int icache_line_size;
44}; 44};
45 45
46#if defined(_KERNEL) || defined(_KMEMUSER) 46#if defined(_KERNEL) || defined(_KMEMUSER)
47#if defined(_KERNEL_OPT) 47#if defined(_KERNEL_OPT)
48#include "opt_lockdebug.h" 
49#include "opt_modular.h" 48#include "opt_modular.h"
50#include "opt_multiprocessor.h" 49#include "opt_multiprocessor.h"
51#include "opt_ppcarch.h" 50#include "opt_ppcarch.h"
52#endif 51#endif
53 52
54#ifdef _KERNEL 53#ifdef _KERNEL
55#include <sys/intr.h> 54#include <sys/intr.h>
56#include <sys/device_if.h> 55#include <sys/device_if.h>
57#include <sys/evcnt.h> 56#include <sys/evcnt.h>
58#include <sys/param.h> 57#include <sys/param.h>
59#include <sys/kernel.h> 58#include <sys/kernel.h>
60#endif 59#endif
61 60