From owner-svn-src-all@FreeBSD.ORG  Sat Jan 14 00:36:07 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A57A9106566B;
	Sat, 14 Jan 2012 00:36:07 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 94A1E8FC0C;
	Sat, 14 Jan 2012 00:36:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0E0a7m4087277;
	Sat, 14 Jan 2012 00:36:07 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0E0a7lx087275;
	Sat, 14 Jan 2012 00:36:07 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <201201140036.q0E0a7lx087275@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Sat, 14 Jan 2012 00:36:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230097 - head/sys/kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Jan 2012 00:36:07 -0000

Author: gonzo
Date: Sat Jan 14 00:36:07 2012
New Revision: 230097
URL: http://svn.freebsd.org/changeset/base/230097

Log:
  Fix kernel modules loading for MIPS64 kernel:
  
      On amd64, link_elf_obj.c must specify KERNBASE rather than
      VM_MIN_KERNEL_ADDRESS to vm_map_find() because kernel loadable
      modules must be mapped for execution in the same upper region
      of the kernel map as the kernel code and data segments.
  
      For MIPS32 KERNBASE lies below KVA area (it's less than
      VM_MIN_KERNEL_ADDRESS) so basically vm_map_find got whole
      KVA to look through. On MIPS64 it's not the case because
      KERNBASE is set to the very end of XKSEG, well out of KVA
      bounds, so vm_map_find always fails. We should use
      VM_MIN_KERNEL_ADDRESS as a base for vm_map_find.
  
  Details obtained from: alc@

Modified:
  head/sys/kern/link_elf_obj.c

Modified: head/sys/kern/link_elf_obj.c
==============================================================================
--- head/sys/kern/link_elf_obj.c	Sat Jan 14 00:28:02 2012	(r230096)
+++ head/sys/kern/link_elf_obj.c	Sat Jan 14 00:36:07 2012	(r230097)
@@ -684,7 +684,11 @@ link_elf_load_file(linker_class_t cls, c
 	 * location of code and data in the kernel's address space, request a
 	 * mapping that is above the kernel.  
 	 */
+#ifdef __amd64__
 	mapbase = KERNBASE;
+#else
+	mapbase = VM_MIN_KERNEL_ADDRESS;
+#endif
 	error = vm_map_find(kernel_map, ef->object, 0, &mapbase,
 	    round_page(mapsize), TRUE, VM_PROT_ALL, VM_PROT_ALL, FALSE);
 	if (error) {