Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d2329d0 authored by Treehugger Robot's avatar Treehugger Robot
Browse files

Merge "Merge 4.9.320 into android-4.9-q" into android-4.9-q

parents fca92dcc ea690b6b

Documentation/kernel-parameters.txt

+12 −0
Original line number Diff line number Diff line
@@ -3593,6 +3593,18 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	ramdisk_size=	[RAM] Sizes of RAM disks in kilobytes

			See Documentation/blockdev/ramdisk.txt.



	random.trust_cpu={on,off}

			[KNL] Enable or disable trusting the use of the

			CPU's random number generator (if available) to

			fully seed the kernel's CRNG. Default is controlled

			by CONFIG_RANDOM_TRUST_CPU.



	random.trust_bootloader={on,off}

			[KNL] Enable or disable trusting the use of a

			seed passed by the bootloader (if available) to

			fully seed the kernel's CRNG. Default is controlled

			by CONFIG_RANDOM_TRUST_BOOTLOADER.



	rcu_nocbs=	[KNL]

			The argument is a cpu list, as described above.

Documentation/sysctl/kernel.txt

+33 −2
Original line number Diff line number Diff line
@@ -779,9 +779,40 @@ The kernel command line parameter printk.devkmsg= overrides this and is 
a one-time setting until next reboot: once set, it cannot be changed by

this sysctl interface anymore.



==============================================================

pty

===



See Documentation/filesystems/devpts.rst.





random

======



This is a directory, with the following entries:



* ``boot_id``: a UUID generated the first time this is retrieved, and

  unvarying after that;



* ``uuid``: a UUID generated every time this is retrieved (this can

  thus be used to generate UUIDs at will);



* ``entropy_avail``: the pool's entropy count, in bits;



* ``poolsize``: the entropy pool size, in bits;



* ``urandom_min_reseed_secs``: obsolete (used to determine the minimum

  number of seconds between urandom pool reseeding). This file is

  writable for compatibility purposes, but writing to it has no effect

  on any RNG behavior;



* ``write_wakeup_threshold``: when the entropy count drops below this

  (as a number of bits), processes waiting to write to ``/dev/random``

  are woken up. This file is writable for compatibility purposes, but

  writing to it has no effect on any RNG behavior.





randomize_va_space:

randomize_va_space

==================



This option can be used to select the type of process address

space randomization that is used in the system, for architectures

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -10079,6 +10079,7 @@ F: drivers/block/brd.c 


RANDOM NUMBER DRIVER

M:	"Theodore Ts'o" <tytso@mit.edu>

M:	Jason A. Donenfeld <Jason@zx2c4.com>

S:	Maintained

F:	drivers/char/random.c

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 319

SUBLEVEL = 320

EXTRAVERSION =

NAME = Roaring Lionus

arch/alpha/include/asm/timex.h

+1 −0
Original line number Diff line number Diff line
@@ -27,5 +27,6 @@ static inline cycles_t get_cycles (void) 
	__asm__ __volatile__ ("rpcc %0" : "=r"(ret));

	return ret;

}

#define get_cycles get_cycles



#endif