NetBSD Problem Report #18925

From VM 7.07 under Emacs 21.2.1
Received: (qmail 18881 invoked by uid 605); 4 Nov 2002 13:45:35 -0000
Message-Id: <15814.31116.323476.758302@whitewater.nowhere.org>
Date: Mon, 4 Nov 2002 05:43:40 -0800
From: stephenm@employees.org
Sender: gnats-bugs-owner@netbsd.org
Reply-To: stephenm@employees.org
To: gnats-bugs@gnats.netbsd.org
Subject: update sysutils/aperture for NetBSD 1.6K
X-Send-Pr-Version: 3.95

>Number:         18925
>Category:       pkg
>Synopsis:       update sysutils/aperture for NetBSD 1.6K
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Nov 04 13:46:00 +0000 2002
>Closed-Date:    Sun Nov 10 08:00:53 +0000 2002
>Last-Modified:  Sun Nov 10 08:01:01 +0000 2002
>Originator:     Stephen Ma
>Release:        NetBSD 1.6K 2002-11-03
>Organization:
	People's Front for the correct spelling of the word "Organisation"
>Environment:
System: NetBSD whitewater.nowhere.org 1.6K NetBSD 1.6K (WHITEWATER) #38: Sun Nov  3 10:35:02 PST 2002     stephenm@whitewater.nowhere.org:/usr/src/sys/arch/i386/compile/WHITEWATER i386
Architecture: i386
Machine: i386
>Description:
After the merge of the i386 MP code into the main sources, the
aperture driver no longer loads, since it refers to two kernel
variables that were moved inside a new struct. This patch updates
the aperture driver package to handle this change.
>How-To-Repeat:
Load the xf86.o lkm into a 1.6K kernel.
>Fix:
     $NetBSD: patch-ab,v 1.5 2002/09/15 19:25:38 tron Exp $
Replace patch-ab with:

--- module/xf86_mod.c.orig	Fri Jul  5 01:36:35 2002
+++ module/xf86_mod.c	Thu Oct 10 22:37:41 2002
@@ -17,9 +17,15 @@
 #include "memrange.h"

 /* Pull in the cpuid values from locore.s */
+#if __NetBSD_Version__ >= 106080000
+extern struct cpu_info cpu_info_primary;
+#define cpu_vendor ((char *)cpu_info_primary.ci_vendor)
+#define cpu_id cpu_info_primary.ci_signature
+#else
 extern int cpu_id;
 extern int cpu_feature;
 extern char cpu_vendor[];
+#endif

 extern struct mem_range_ops i686_mrops, k6_mrops;

@@ -31,7 +37,11 @@
 	0,
 	seltrue, xf86mmap, 0};

+#if __NetBSD_Version__ >= 106080000
+MOD_DEV("xf86", "xf86ap", NULL, -1, &newdev, -1)
+#else
 MOD_DEV("xf86", LM_DT_CHAR, -1, &newdev)
+#endif

 char *xf86_major_version = "2";
 char *xf86_minor_version = "0";
@@ -76,7 +86,10 @@

 	case LKM_E_UNLOAD:
 		/* Free allocated memory */
-		free(mem_range_softc.mr_desc, M_MEMDESC);
+		if (mem_range_softc.mr_desc != NULL) {
+			free(mem_range_softc.mr_desc, M_MEMDESC);
+			mem_range_softc.mr_desc = NULL;
+		}
 		break;

 	case LKM_E_STAT:

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: tron 
State-Changed-When: Sat Nov 9 23:59:40 PST 2002 
State-Changed-Why:  
I've applied the patch and bumped the package revision. Thanks a lot. 

From: Matthias Scheler <tron@netbsd.org>
To: gnats-bugs@gnats.netbsd.org
Cc:  
Subject: pr/18925 CVS commit: pkgsrc/sysutils/aperture
Date: Sun, 10 Nov 2002 09:59:04 +0200 (EET)

 Module Name:	pkgsrc
 Committed By:	tron
 Date:		Sun Nov 10 07:59:03 UTC 2002

 Modified Files:
 	pkgsrc/sysutils/aperture: Makefile distinfo
 	pkgsrc/sysutils/aperture/patches: patch-ab

 Log Message:
 Make this LKM load again under NetBSD 1.6K and newer. The patch was
 supplied by Stephen Ma in PR pkg/18925. Bump the package revision
 to reflect this change.


 To generate a diff of this commit:
 cvs rdiff -r1.23 -r1.24 pkgsrc/sysutils/aperture/Makefile
 cvs rdiff -r1.5 -r1.6 pkgsrc/sysutils/aperture/distinfo
 cvs rdiff -r1.5 -r1.6 pkgsrc/sysutils/aperture/patches/patch-ab

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

>Unformatted:

NetBSD Home
NetBSD PR Database Search

(Contact us) $NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026 The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.