From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YbnN4-0000uy-M0 for user-mode-linux-devel@lists.sourceforge.net; Sat, 28 Mar 2015 09:49:38 +0000 Received: from www17.your-server.de ([213.133.104.17]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1YbnN3-0003X6-EX for user-mode-linux-devel@lists.sourceforge.net; Sat, 28 Mar 2015 09:49:38 +0000 Received: from [217.255.200.183] (helo=localhost.localdomain) by www17.your-server.de with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.80.1) (envelope-from ) id 1YbnMw-0000Jw-Kx for user-mode-linux-devel@lists.sourceforge.net; Sat, 28 Mar 2015 10:49:30 +0100 Message-ID: <1427536169.3940.31.camel@m3y3r.de> From: Thomas Meyer Date: Sat, 28 Mar 2015 10:49:29 +0100 Mime-Version: 1.0 List-Id: The user-mode Linux development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: user-mode-linux-devel-bounces@lists.sourceforge.net Subject: [uml-devel] [PATCH] um: Print minimum physical memory requirement To: user-mode-linux-devel Print a more sensible message about the minimum physical memory requirement. Signed-off-by: Thomas Meyer --- diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c index 549ecf3..a91cf05 100644 --- a/arch/um/kernel/physmem.c +++ b/arch/um/kernel/physmem.c @@ -63,16 +63,23 @@ void __init setup_physmem(unsigned long start, unsigned long reserve_end, unsigned long reserve = reserve_end - start; int pfn = PFN_UP(__pa(reserve_end)); int delta = (len - reserve) >> PAGE_SHIFT; - int err, offset, bootmap_size; + int err, offset, bootmap_size, map_size; + + offset = uml_reserved - uml_physmem; + map_size = len - offset; + if(map_size <= 0) { + printf("Too few physical memory! Needed=%d, given=%d\n", + offset, len); + exit(1); + } physmem_fd = create_mem_file(len + highmem); - offset = uml_reserved - uml_physmem; err = os_map_memory((void *) uml_reserved, physmem_fd, offset, - len - offset, 1, 1, 1); + map_size, 1, 1, 1); if (err < 0) { printf("setup_physmem - mapping %ld bytes of memory at 0x%p " - "failed - errno = %d\n", len - offset, + "failed - errno = %d\n", map_size, (void *) uml_reserved, err); exit(1); } ------------------------------------------------------------------------------ Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ User-mode-linux-devel mailing list User-mode-linux-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel