---

yaml --- r: 309146 b: refs/heads/master c: f156ffc h: refs/heads/master v: v3
git-mirror · May 8, 2012 · c1a81ed · c1a81ed
1 parent 91f99cf
commit c1a81ed
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git 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
@@ -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;
 }