From darius@midget.dons.net.au  Sun Jul 26 19:23:16 1998
Received: from midget.dons.net.au (daniel.lnk.telstra.net [139.130.137.70])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id TAA20533
          for <FreeBSD-gnats-submit@freebsd.org>; Sun, 26 Jul 1998 19:23:10 -0700 (PDT)
          (envelope-from darius@midget.dons.net.au)
Received: (from darius@localhost)
	by midget.dons.net.au (8.8.8/8.8.5) id LAA12166;
	Mon, 27 Jul 1998 11:52:35 +0930 (CST)
Message-Id: <199807270222.LAA12166@midget.dons.net.au>
Date: Mon, 27 Jul 1998 11:52:35 +0930 (CST)
From: "Daniel J. O'Connor" <darius@dons.net.au>
Reply-To: darius@dons.net.au
To: FreeBSD-gnats-submit@freebsd.org
Subject: Linux LKM won't compile under -current (easy fix)
X-Send-Pr-Version: 3.2

>Number:         7404
>Category:       kern
>Synopsis:       Linux LKM won't compile under -current (easy fix)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 26 19:30:00 PDT 1998
>Closed-Date:    Mon Jul 27 06:09:10 PDT 1998
>Last-Modified:  Mon Jul 27 06:10:59 PDT 1998
>Originator:     Daniel J. O'Connor
>Release:        FreeBSD 3.0-CURRENT i386
>Organization:
>Environment:

The -current tree was checked out about 2 weeks ago, updated the Linux emultaor
tree this morning (ie cd /usr/src/sys/i386/linux ; cvs update).

>Description:
Won't compile because opt_linux.h is wanted by linux_util.h.

>How-To-Repeat:

cd /usr/src/lkm/linux
make

>Fix:
Make the #include of opt_linux.h conditional on LKM
	
*** linux_util.h        Mon Jul 27 11:48:14 1998
--- linux_util.h.old    Sun Jul 26 13:04:11 1998
***************
*** 39,45 ****
--- 39,47 ----
  #ifndef       _LINUX_UTIL_H_
  #define       _LINUX_UTIL_H_
      
+ #ifndef LKM
  #include "opt_linux.h"
+ #endif
	  
  #include <vm/vm.h>
  #include <vm/vm_param.h>

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: phk 
State-Changed-When: Mon Jul 27 06:09:10 PDT 1998 
State-Changed-Why:  
can't reproduce, make sure your src/lkm/linux is also updated. 
>Unformatted:
