Merge branch 'tip-x86-kaslr' of git://git.kernel.org/pub/scm/linux/kernel/git/bp...
authorIngo Molnar <mingo@kernel.org>
Thu, 19 Feb 2015 11:06:04 +0000 (12:06 +0100)
committerIngo Molnar <mingo@kernel.org>
Thu, 19 Feb 2015 11:31:34 +0000 (12:31 +0100)
commita267b0a349bb021c010e36a2a13e1e16657b1b0f
tree4438a10ecc864f15ce6f37c1764fffa995a9a175
parentee408b4207c8281a91f039e89d06de264d319466
parent4e7c22d447bb6d7e37bfe39ff658486ae78e8d77
Merge branch 'tip-x86-kaslr' of git://git./linux/kernel/git/bp/bp into x86/urgent

Pull ASLR and kASLR fixes from Borislav Petkov:

  - Add a global flag announcing KASLR state so that relevant code can do
    informed decisions based on its setting. (Jiri Kosina)

  - Fix a stack randomization entropy decrease bug. (Hector Marco-Gisbert)

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/setup.c