From owner-p4-projects@FreeBSD.ORG Sun Jul 5 16:01:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 538731065673; Sun, 5 Jul 2009 16:01:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 136FE106566C for ; Sun, 5 Jul 2009 16:01:05 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 01C748FC17 for ; Sun, 5 Jul 2009 16:01:05 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n65G14WM081830 for ; Sun, 5 Jul 2009 16:01:04 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n65G14aR081828 for perforce@freebsd.org; Sun, 5 Jul 2009 16:01:04 GMT (envelope-from trasz@freebsd.org) Date: Sun, 5 Jul 2009 16:01:04 GMT Message-Id: <200907051601.n65G14aR081828@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 165639 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Jul 2009 16:01:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=165639 Change 165639 by trasz@trasz_victim on 2009/07/05 16:00:16 Make the kernel just a little more bootable. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#25 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#13 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#19 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#25 (text+ko) ==== @@ -86,6 +86,8 @@ { "filedescriptors", HRL_RESOURCE_FILEDESCRIPTORS }, { "sbsize", HRL_RESOURCE_SBSIZE }, { "vmemoryuse", HRL_RESOURCE_VMEMORYUSE }, + { "pty", HRL_RESOURCE_PTY }, + { "swap", HRL_RESOURCE_SWAP }, { NULL, -1 }}; struct dict actionnames[] = { ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#13 (text+ko) ==== @@ -707,8 +707,13 @@ subject = HRL_SUBJECT_USER; id = td->td_ucred->cr_uid; break; + case RLIMIT_SWAP: + resource = HRL_RESOURCE_SWAP; + subject = HRL_SUBJECT_USER; + id = td->td_ucred->cr_uid; + break; default: - panic("hrl_handle_setrlimit: unknown limit"); + panic("hrl_handle_setrlimit: unknown limit %d", which); } if (lim->rlim_cur != RLIM_INFINITY) { ==== //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#19 (text+ko) ==== @@ -87,7 +87,8 @@ #define HRL_RESOURCE_SBSIZE 0x000a #define HRL_RESOURCE_VMEMORYUSE 0x000b #define HRL_RESOURCE_PTY 0x000c -#define HRL_RESOURCE_MAX HRL_RESOURCE_PTY +#define HRL_RESOURCE_SWAP 0x000d +#define HRL_RESOURCE_MAX HRL_RESOURCE_SWAP #define HRL_ACTION_UNDEFINED 0x0000 #define HRL_ACTION_DENY 0x0001