From owner-svn-src-head@FreeBSD.ORG Wed Sep 12 15:49:52 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E3C38106567F; Wed, 12 Sep 2012 15:49:51 +0000 (UTC) (envelope-from arthurmesh@gmail.com) Received: from mail-pb0-f54.google.com (mail-pb0-f54.google.com [209.85.160.54]) by mx1.freebsd.org (Postfix) with ESMTP id 59C868FC4D; Wed, 12 Sep 2012 15:49:50 +0000 (UTC) Received: by pbbrp2 with SMTP id rp2so2710447pbb.13 for ; Wed, 12 Sep 2012 08:49:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=fcimNR3VYM8pOH5doT3CJYfM+o4Wcl/7StLK7IY40vw=; b=LMTKll2yOGpjy+Cf748UPOyhS7v7a2qIsfhR8FfUesPW0Fsj6nrNiGTBPiFgWy6tak Xi8pEvdIh4AxX9/2Z1LLW8UrJLVqISonSk/qhPFSpbyw52Au7Yr8Lvrq2mG/Dj57C5CD DaAWVlWPgW2bCoo7umZQn6jV7SdgvPJ2JVkR/ND5hf0HGCY0e0Fp0OtIIAP8dIlhXH4v Q29ZrKcihrMGOTXUq/TFc6xKT7VQ3Zl55tTZvngs9Qk0RxUPWIVZoU3psarasDQBiK2W zqyLcmzaJsqYB/1TMrzldiS21PYsdX+mXMYJXYyjOTy8BCq4u9/YhPL0TyOnHGr3FSJK O0VQ== Received: by 10.68.223.163 with SMTP id qv3mr17196331pbc.101.1347464987618; Wed, 12 Sep 2012 08:49:47 -0700 (PDT) Received: from x96.org (x96.org. [64.85.165.177]) by mx.google.com with ESMTPS id vd4sm11576577pbc.41.2012.09.12.08.49.43 (version=SSLv3 cipher=OTHER); Wed, 12 Sep 2012 08:49:45 -0700 (PDT) Date: Wed, 12 Sep 2012 08:49:41 -0700 From: Arthur Mesh To: Konstantin Belousov Message-ID: <20120912154941.GG14077@x96.org> References: <20120911205345.GD14077@x96.org> <20120912043302.GN37286@deviant.kiev.zoral.com.ua> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120912043302.GN37286@deviant.kiev.zoral.com.ua> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r240135 - in head/sys: amd64/conf conf dev/random i386/conf modules/random X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2012 15:49:52 -0000 On Wed, Sep 12, 2012 at 07:33:02AM +0300, Konstantin Belousov wrote: > Can you submit the desired patch ? Sure, Index: sys/i386/conf/GENERIC =================================================================== --- sys/i386/conf/GENERIC (revision 240406) +++ sys/i386/conf/GENERIC (working copy) @@ -306,7 +306,7 @@ device loop # Network loopback device random # Entropy device options PADLOCK_RNG # VIA Padlock RNG -options IVY_RNG # Intel Bull Mountain RNG +options RDRAND_RNG # Intel Bull Mountain RNG device ether # Ethernet support device vlan # 802.1Q VLAN support device tun # Packet tunnel. Index: sys/dev/random/probe.c =================================================================== --- sys/dev/random/probe.c (revision 240406) +++ sys/dev/random/probe.c (working copy) @@ -55,7 +55,7 @@ #ifdef PADLOCK_RNG extern struct random_systat random_nehemiah; #endif -#ifdef IVY_RNG +#ifdef RDRAND_RNG extern struct random_systat random_ivy; #endif #endif @@ -79,7 +79,7 @@ *systat = random_nehemiah; } #endif -#ifdef IVY_RNG +#ifdef RDRAND_RNG if (cpu_feature2 & CPUID2_RDRAND) { int enable; Index: sys/dev/random/ivy.c =================================================================== --- sys/dev/random/ivy.c (revision 240406) +++ sys/dev/random/ivy.c (working copy) @@ -30,7 +30,7 @@ #include "opt_cpu.h" -#ifdef IVY_RNG +#ifdef RDRAND_RNG #include #include Index: sys/conf/options.amd64 =================================================================== --- sys/conf/options.amd64 (revision 240406) +++ sys/conf/options.amd64 (working copy) @@ -71,4 +71,4 @@ # hw random number generators for random(4) PADLOCK_RNG opt_cpu.h -IVY_RNG opt_cpu.h +RDRAND_RNG opt_cpu.h Index: sys/conf/options.i386 =================================================================== --- sys/conf/options.i386 (revision 240406) +++ sys/conf/options.i386 (working copy) @@ -126,4 +126,4 @@ # hw random number generators for random(4) PADLOCK_RNG opt_cpu.h -IVY_RNG opt_cpu.h +RDRAND_RNG opt_cpu.h Index: sys/amd64/conf/GENERIC =================================================================== --- sys/amd64/conf/GENERIC (revision 240406) +++ sys/amd64/conf/GENERIC (working copy) @@ -293,7 +293,7 @@ device loop # Network loopback device random # Entropy device options PADLOCK_RNG # VIA Padlock RNG -options IVY_RNG # Intel Bull Mountain RNG +options RDRAND_RNG # Intel Bull Mountain RNG device ether # Ethernet support device vlan # 802.1Q VLAN support device tun # Packet tunnel.