aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/machine_kexec_32.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/machine_kexec_32.c')
-rw-r--r--arch/x86/kernel/machine_kexec_32.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
index c1c429d00130..03657e784fd8 100644
--- a/arch/x86/kernel/machine_kexec_32.c
+++ b/arch/x86/kernel/machine_kexec_32.c
@@ -157,8 +157,7 @@ int machine_kexec_prepare(struct kimage *image)
157{ 157{
158 int error; 158 int error;
159 159
160 if (nx_enabled) 160 set_pages_x(image->control_code_page, 1);
161 set_pages_x(image->control_code_page, 1);
162 error = machine_kexec_alloc_page_tables(image); 161 error = machine_kexec_alloc_page_tables(image);
163 if (error) 162 if (error)
164 return error; 163 return error;
@@ -172,8 +171,7 @@ int machine_kexec_prepare(struct kimage *image)
172 */ 171 */
173void machine_kexec_cleanup(struct kimage *image) 172void machine_kexec_cleanup(struct kimage *image)
174{ 173{
175 if (nx_enabled) 174 set_pages_nx(image->control_code_page, 1);
176 set_pages_nx(image->control_code_page, 1);
177 machine_kexec_free_page_tables(image); 175 machine_kexec_free_page_tables(image);
178} 176}
179 177