From c1a81ed0dac8b9d53fc6d31b6636adb1a1981231 Mon Sep 17 00:00:00 2001
From: Jarkko Sakkinen <jarkko.sakkinen@intel.com>
Date: Tue, 8 May 2012 21:22:30 +0300
Subject: [PATCH] --- yaml --- r: 309146 b: refs/heads/master c:
 f156ffc439951b63cfa9f4d999a8d54267f13282 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/arch/x86/kernel/realmode.c | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fd7667acefbd..fe1c23556317 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9b77ccb52a5c77233b0e557b7d4417b00ef4012
+refs/heads/master: f156ffc439951b63cfa9f4d999a8d54267f13282
diff --git a/trunk/arch/x86/kernel/realmode.c b/trunk/arch/x86/kernel/realmode.c
index a465775b32f2..d85ac20bb4eb 100644
--- a/trunk/arch/x86/kernel/realmode.c
+++ b/trunk/arch/x86/kernel/realmode.c
@@ -86,7 +86,21 @@ static int __init set_real_mode_permissions(void)
 		PAGE_ALIGN(real_mode_header.end) -
 		__pa(real_mode_base);
 
-	set_memory_x((unsigned long) real_mode_base, all_size >> PAGE_SHIFT);
+	size_t ro_size =
+		PAGE_ALIGN(real_mode_header.ro_end) -
+		__pa(real_mode_base);
+
+	size_t text_size =
+		PAGE_ALIGN(real_mode_header.ro_end) -
+		real_mode_header.text_start;
+
+	unsigned long text_start =
+		(unsigned long) __va(real_mode_header.text_start);
+
+	set_memory_nx((unsigned long) real_mode_base, all_size >> PAGE_SHIFT);
+	set_memory_ro((unsigned long) real_mode_base, ro_size >> PAGE_SHIFT);
+	set_memory_x((unsigned long) text_start, text_size >> PAGE_SHIFT);
+
 	return 0;
 }