Module Name: src Committed By: skrll Date: Thu Jul 23 19:04:03 UTC 2020
Modified Files: src/sys/arch/evbarm/include: intr.h src/sys/arch/hpcarm/include: intr.h Log Message: unidef -U_LKM To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/include/intr.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hpcarm/include/intr.h 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/evbarm/include/intr.h diff -u src/sys/arch/evbarm/include/intr.h:1.26 src/sys/arch/evbarm/include/intr.h:1.27 --- src/sys/arch/evbarm/include/intr.h:1.26 Thu Mar 13 23:48:38 2014 +++ src/sys/arch/evbarm/include/intr.h Thu Jul 23 19:04:03 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.26 2014/03/13 23:48:38 matt Exp $ */ +/* $NetBSD: intr.h,v 1.27 2020/07/23 19:04:03 skrll Exp $ */ /* * Copyright (c) 2001, 2003 Wasabi Systems, Inc. @@ -71,14 +71,6 @@ #include <sys/queue.h> -#if defined(_LKM) - -int _splraise(int); -int _spllower(int); -void splx(int); - -#else /* _LKM */ - #include "opt_arm_intr_impl.h" #if defined(ARM_INTR_IMPL) @@ -122,8 +114,6 @@ void splx(int); #endif /* ARM_INTR_IMPL */ -#endif /* _LKM */ - typedef uint8_t ipl_t; typedef struct { ipl_t _ipl; Index: src/sys/arch/hpcarm/include/intr.h diff -u src/sys/arch/hpcarm/include/intr.h:1.19 src/sys/arch/hpcarm/include/intr.h:1.20 --- src/sys/arch/hpcarm/include/intr.h:1.19 Tue Feb 4 18:51:16 2014 +++ src/sys/arch/hpcarm/include/intr.h Thu Jul 23 19:04:03 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.19 2014/02/04 18:51:16 matt Exp $ */ +/* $NetBSD: intr.h,v 1.20 2020/07/23 19:04:03 skrll Exp $ */ /* * Copyright (c) 1997 Mark Brinicombe. @@ -72,14 +72,6 @@ #include <sys/queue.h> -#if defined(_LKM) - -int _splraise(int); -int _spllower(int); -void splx(int); - -#else /* _LKM */ - #include "opt_arm_intr_impl.h" #if defined(ARM_INTR_IMPL) @@ -124,8 +116,6 @@ void splx(int); #endif /* ARM_INTR_IMPL */ -#endif /* _LKM */ - #define splsoft() _splraise(IPL_SOFT) typedef uint8_t ipl_t;