[Pull Request] [Natty] x86: clear XD_DISABLED flag on Intel

[Tim Gardner]

On 11/16/2010 12:40 PM, Kees Cook wrote:
> Hi,
>
> This is from a branch of x86 tip:
> http://git.kernel.org/?p=linux/kernel/git/x86/linux-2.6-tip.git;a=shortlog;h=refs/heads/x86/cpu
>
> I'd like to get it into Ubuntu now to help with testing so it can move more
> quickly into Linus's tree upstream.
>
>
> The following changes since commit e7cd9edbade47def723bd06dd082afe20427e26a:
>
>    UBUNTU: updateconfigs following rebase to v2.6.37-rc2 (2010-11-16 13:18:04 +0000)
>
> are available in the git repository at:
>    git://kernel.ubuntu.com/kees/ubuntu-natty.git master
>
> Kees Cook (4):
>        x86, cpu: Rename verify_cpu_64.S to verify_cpu.S
>        x86, cpu: Clear XD_DISABLED flag on Intel to regain NX
>        x86, cpu: Call verify_cpu during 32bit CPU startup
>        x86, cpu: Only CPU features determine NX capabilities
>
>   arch/x86/boot/compressed/head_64.S                |    2 +-
>   arch/x86/kernel/head_32.S                         |    6 +++
>   arch/x86/kernel/trampoline_64.S                   |    2 +-
>   arch/x86/kernel/{verify_cpu_64.S =>  verify_cpu.S} |   49 +++++++++++++++++---
>   arch/x86/mm/setup_nx.c                            |    2 +-
>   5 files changed, 50 insertions(+), 11 deletions(-)
>   rename arch/x86/kernel/{verify_cpu_64.S =>  verify_cpu.S} (65%)
>
>
> Thanks,
>
> -Kees
>

pulled

-- 
Tim Gardner tim.gardner at canonical.com