diff --git a/sys/arch/powerpc/include/types.h b/sys/arch/powerpc/include/types.h index cc7c02d9bc41..31be2032ca0a 100644 --- a/sys/arch/powerpc/include/types.h +++ b/sys/arch/powerpc/include/types.h @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.59 2019/04/07 05:25:55 thorpej Exp $ */ +/* $NetBSD: types.h,v 1.60 2019/12/06 06:38:39 mrg Exp $ */ /*- * Copyright (C) 1995 Wolfgang Solfrank. @@ -87,8 +87,6 @@ typedef __uint32_t tlb_asid_t; /* for booke */ #define __HAVE___LWP_GETTCB_FAST #define __HAVE___LWP_SETTCB #define __HAVE_TLS_VARIANT_I -#define __OPENFIRMIO_OPEN_CHECK_BROKEN -int __openfirmio_open_check_broken(void); #if defined(_KERNEL) || defined(_KMEMUSER) #define PCU_FPU 0 /* FPU */ diff --git a/sys/arch/powerpc/powerpc/openfirm.c b/sys/arch/powerpc/powerpc/openfirm.c index 0baec11e3f9c..518d5513be49 100644 --- a/sys/arch/powerpc/powerpc/openfirm.c +++ b/sys/arch/powerpc/powerpc/openfirm.c @@ -1,4 +1,4 @@ -/* $NetBSD: openfirm.c,v 1.29 2019/11/16 00:16:55 macallan Exp $ */ +/* $NetBSD: openfirm.c,v 1.30 2019/12/06 06:38:39 mrg Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -34,7 +34,7 @@ #include "opt_multiprocessor.h" #include -__KERNEL_RCSID(0, "$NetBSD: openfirm.c,v 1.29 2019/11/16 00:16:55 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: openfirm.c,v 1.30 2019/12/06 06:38:39 mrg Exp $"); #include #include @@ -762,11 +762,3 @@ ofbcopy(const void *src, void *dst, size_t len) while (len-- > 0) *dp++ = *sp++; } - -#ifdef __OPENFIRMIO_OPEN_CHECK_BROKEN -int -__openfirmio_open_check_broken(void) -{ - return strncmp(model_name, "Pegasos", 7) == 0 ? ENXIO : 0; -} -#endif diff --git a/sys/dev/ofw/openfirmio.c b/sys/dev/ofw/openfirmio.c index d1b1d1ecdb51..cdcb88558012 100644 --- a/sys/dev/ofw/openfirmio.c +++ b/sys/dev/ofw/openfirmio.c @@ -1,4 +1,4 @@ -/* $NetBSD: openfirmio.c,v 1.14 2019/01/08 07:46:11 mrg Exp $ */ +/* $NetBSD: openfirmio.c,v 1.15 2019/12/06 06:38:39 mrg Exp $ */ /* * Copyright (c) 1992, 1993 @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: openfirmio.c,v 1.14 2019/01/08 07:46:11 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: openfirmio.c,v 1.15 2019/12/06 06:38:39 mrg Exp $"); #include #include @@ -122,11 +122,7 @@ static int openfirmopen(dev_t dev, int flag, int mode, struct lwp *l) { -#ifdef __OPENFIRMIO_OPEN_CHECK_BROKEN - return __openfirmio_open_check_broken(); -#else return 0; -#endif } static int