Merge branch 'mini2440-dev-unlikely' into mini2440-dev
[linux-2.6/mini2440.git] / arch / x86 / mm / setup_nx.c
blob513d8ed5d2ec193aced4b43c66f008fee859d885
1 #include <linux/spinlock.h>
2 #include <linux/errno.h>
3 #include <linux/init.h>
5 #include <asm/pgtable.h>
7 int nx_enabled;
9 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
10 static int disable_nx __cpuinitdata;
13 * noexec = on|off
15 * Control non-executable mappings for processes.
17 * on Enable
18 * off Disable
20 static int __init noexec_setup(char *str)
22 if (!str)
23 return -EINVAL;
24 if (!strncmp(str, "on", 2)) {
25 __supported_pte_mask |= _PAGE_NX;
26 disable_nx = 0;
27 } else if (!strncmp(str, "off", 3)) {
28 disable_nx = 1;
29 __supported_pte_mask &= ~_PAGE_NX;
31 return 0;
33 early_param("noexec", noexec_setup);
34 #endif
36 #ifdef CONFIG_X86_PAE
37 void __init set_nx(void)
39 unsigned int v[4], l, h;
41 if (cpu_has_pae && (cpuid_eax(0x80000000) > 0x80000001)) {
42 cpuid(0x80000001, &v[0], &v[1], &v[2], &v[3]);
44 if ((v[3] & (1 << 20)) && !disable_nx) {
45 rdmsr(MSR_EFER, l, h);
46 l |= EFER_NX;
47 wrmsr(MSR_EFER, l, h);
48 nx_enabled = 1;
49 __supported_pte_mask |= _PAGE_NX;
53 #else
54 void set_nx(void)
57 #endif
59 #ifdef CONFIG_X86_64
60 void __cpuinit check_efer(void)
62 unsigned long efer;
64 rdmsrl(MSR_EFER, efer);
65 if (!(efer & EFER_NX) || disable_nx)
66 __supported_pte_mask &= ~_PAGE_NX;
68 #endif