Bug 149182

Summary: [patch] Small error in linux(4) man page.
Product: Documentation Reporter: Fernando Apesteguía <fernape>
Component: Books & ArticlesAssignee: Bernhard Schmidt <bschmidt>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description Fernando Apesteguía freebsd_committer freebsd_triage 2010-08-01 19:40:03 UTC
In the linux(4) man page is stated that in order to have linux ABI emulation, the following line must be included in the kernel configuration file:

options COMPAT_LINUX

The one above should be:

options COMPAT_LINUX32

since 8.1-RELEASE

Fix: A very simple patch is attached

Patch attached with submission follows:
How-To-Repeat: man linux
Comment 1 Bernhard Schmidt freebsd_committer freebsd_triage 2010-08-06 21:18:26 UTC
Responsible Changed
From-To: freebsd-doc->bschmidt

Over to me.
Comment 2 dfilter service freebsd_committer freebsd_triage 2010-08-06 21:18:29 UTC
Author: bschmidt
Date: Fri Aug  6 20:18:16 2010
New Revision: 210959
URL: http://svn.freebsd.org/changeset/base/210959

Log:
  Obviously the option is known as COMPAT_LINUX32 on amd64.
  
  PR:		docs/149182
  Pointed out by:	Fernando <fernando.apesteguia at gmail.com>
  MFC after:	3 days

Modified:
  head/share/man/man4/linux.4

Modified: head/share/man/man4/linux.4
==============================================================================
--- head/share/man/man4/linux.4	Fri Aug  6 20:13:36 2010	(r210958)
+++ head/share/man/man4/linux.4	Fri Aug  6 20:18:16 2010	(r210959)
@@ -31,13 +31,18 @@
 .Nm linux
 .Nd Linux ABI support
 .Sh SYNOPSIS
-To compile support for this ABI into the kernel,
+To compile support for this ABI into an i386 kernel
 place the following line in your
 kernel configuration file:
 .Bd -ragged -offset indent
 .Cd "options COMPAT_LINUX"
 .Ed
 .Pp
+for an amd64 kernel use:
+.Bd -ragged -offset indent
+.Cd "options COMPAT_LINUX32"
+.Ed
+.Pp
 Alternatively, to load the ABI as a
 module at boot time, place the following line in
 .Xr loader.conf 5 :
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
Comment 3 Bernhard Schmidt freebsd_committer freebsd_triage 2010-08-06 21:19:23 UTC
State Changed
From-To: open->patched

You are right about that COMPAT_LINUX is not available on amd64. It 
is known as COMPAT_LINUX32 there. But it is still known as 
COMPAT_LINUX on i386, so I've committed a modified version 
of your patch which should make that clear. 

Thanks for pointing this out!
Comment 4 Fernando Apesteguía freebsd_committer freebsd_triage 2010-08-07 17:43:46 UTC
Yes, that's right. I don't have any i386 systems so I just noticed it
changed for amd64.

Thanks!
Comment 5 dfilter service freebsd_committer freebsd_triage 2010-08-11 08:02:24 UTC
Author: bschmidt
Date: Wed Aug 11 07:02:08 2010
New Revision: 211169
URL: http://svn.freebsd.org/changeset/base/211169

Log:
  MFC r210959:
  Obviously the option is known as COMPAT_LINUX32 on amd64.
  
  PR:		docs/149182
  Pointed out by:	Fernando <fernando.apesteguia at gmail.com>

Modified:
  stable/8/share/man/man4/linux.4
Directory Properties:
  stable/8/share/man/man4/   (props changed)

Modified: stable/8/share/man/man4/linux.4
==============================================================================
--- stable/8/share/man/man4/linux.4	Wed Aug 11 06:49:29 2010	(r211168)
+++ stable/8/share/man/man4/linux.4	Wed Aug 11 07:02:08 2010	(r211169)
@@ -31,13 +31,18 @@
 .Nm linux
 .Nd Linux ABI support
 .Sh SYNOPSIS
-To compile support for this ABI into the kernel,
+To compile support for this ABI into an i386 kernel
 place the following line in your
 kernel configuration file:
 .Bd -ragged -offset indent
 .Cd "options COMPAT_LINUX"
 .Ed
 .Pp
+for an amd64 kernel use:
+.Bd -ragged -offset indent
+.Cd "options COMPAT_LINUX32"
+.Ed
+.Pp
 Alternatively, to load the ABI as a
 module at boot time, place the following line in
 .Xr loader.conf 5 :
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
Comment 6 Bernhard Schmidt freebsd_committer freebsd_triage 2010-08-11 08:02:35 UTC
State Changed
From-To: patched->closed

MFC done.