From f8d6582f252cc6c19bdd1410ab7c59d7af0ae0d9 Mon Sep 17 00:00:00 2001
From: Fukang Chen <loader@FreeBSD.org>
Date: Fri, 11 Dec 2009 16:14:24 +0000
Subject: [PATCH] MFen:   arch-handbook:                       
 boot/chapter.sgml     1.26 -> 1.27                driverbasics/chapter.sgml  
   1.36 -> 1.37   [1]

Merge work done by:     delphij@ [1]
Obtained from:          The FreeBSD Simplified Chinese Project
---
 zh_CN.GB2312/books/arch-handbook/boot/chapter.sgml        | 6 ++++--
 .../books/arch-handbook/driverbasics/chapter.sgml         | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/zh_CN.GB2312/books/arch-handbook/boot/chapter.sgml b/zh_CN.GB2312/books/arch-handbook/boot/chapter.sgml
index 5de6dec7d7..2ed26afce6 100644
--- a/zh_CN.GB2312/books/arch-handbook/boot/chapter.sgml
+++ b/zh_CN.GB2312/books/arch-handbook/boot/chapter.sgml
@@ -2,7 +2,7 @@
 The FreeBSD Documentation Project
 The FreeBSD Simplified Chinese Project
 
-Original Revision: 1.26
+Original Revision: 1.27
 
 Copyright (c) 2002 Sergey Lyubka <devnull@uptsoft.com>
 All rights reserved
@@ -420,7 +420,9 @@ struct bootinfo {
   <sect1 id="boot-kernel">
     <title>内核初始化</title>
 
-    <para>loader跳转至哪里呢？那就是内核的入口点。让我们来看一下链接内核的命令：</para>
+    <para>让我们来看一下链接内核的命令。
+      这能帮助我们了解 loader 传递给内核的准确位置。
+      这个位置就是内核真实的入口点。</para>
 
     <programlisting><filename>sys/conf/Makefile.i386:</filename>
 ld -elf -Bdynamic -T /usr/src/sys/conf/ldscript.i386  -export-dynamic \
diff --git a/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.sgml b/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.sgml
index 15d27e76d6..77e28f433d 100644
--- a/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.sgml
+++ b/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.36
+     Original Revision: 1.37
      $FreeBSD$
 -->
 
@@ -112,7 +112,7 @@ skel_loader(struct module *m, int what, void *arg)
     uprintf("Skeleton KLD unloaded.\n");
     break;
   default:
-    err = EINVAL;
+    err = EOPNOTSUPP;
     break;
   }
   return(err);
@@ -281,7 +281,7 @@ echo_loader(struct module *m, int what, void *arg)
 		printf("Echo device unloaded.\n");
 		break;
 	default:
-		err = EINVAL;
+		err = EOPNOTSUPP;
 		break;
 	}
 	return(err);
@@ -435,7 +435,7 @@ echo_loader(struct module *m, int what, void *arg)
 		printf("Echo device unloaded.\n");
 		break;
 	default:
-		err = EINVAL;
+		err = EOPNOTSUPP;
 		break;
 	}
 	return(err);