[patch] Non Gentoo specific fixes for pax kernels on IA64

pax-kernel-fix-fox-ia64.patch (text/plain), 1.76 KB, created by Dennis Schridde on 2012-02-01 11:53:48 UTC

--- arch/ia64/include/asm/thread_info.h.orig	2012-02-01 08:44:49.000000000 +0100
+++ arch/ia64/include/asm/thread_info.h	2012-02-01 08:44:57.000000000 +0100
@@ -31,6 +31,7 @@
 	mm_segment_t addr_limit;	/* user-level address space limit */
 	int preempt_count;		/* 0=premptable, <0=BUG; will also serve as bh-counter */
 	struct restart_block restart_block;
+	unsigned long		lowest_stack;
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
 	__u64 ac_stamp;
 	__u64 ac_leave;
--- arch/ia64/include/asm/page.h.orig	2012-02-01 08:19:59.000000000 +0100
+++ arch/ia64/include/asm/page.h	2012-02-01 08:21:00.000000000 +0100
@@ -55,6 +55,9 @@
 # define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
 #endif /* CONFIG_HUGETLB_PAGE */
 
+#define ktla_ktva(addr)     (addr)
+#define ktva_ktla(addr)     (addr)
+
 #ifdef __ASSEMBLY__
 # define __pa(x)		((x) - PAGE_OFFSET)
 # define __va(x)		((x) + PAGE_OFFSET)
--- arch/ia64/kernel/module.c.orig	2012-02-01 09:14:44.000000000 +0100
+++ arch/ia64/kernel/module.c	2012-02-01 12:45:42.000000000 +0100
@@ -304,14 +304,27 @@
 
 #endif /* !USE_BRL */
 
-void *
-module_alloc (unsigned long size)
+#ifdef CONFIG_PAX_KERNEXEC
+void *module_alloc(unsigned long size)
 {
-	if (!size)
+	if (size == 0)
 		return NULL;
+
 	return vmalloc(size);
 }
 
+void *module_alloc_exec(unsigned long size)
+#else
+void *module_alloc(unsigned long size)
+#endif
+
+{
+	if (size == 0)
+		return NULL;
+
+	return vmalloc_exec(size);
+}
+
 void
 module_free (struct module *mod, void *module_region)
 {
@@ -322,6 +335,13 @@
 	vfree(module_region);
 }
 
+#ifdef CONFIG_PAX_KERNEXEC
+void module_free_exec(struct module *mod, void *module_region)
+{
+	module_free(mod, module_region);
+}
+#endif
+
 /* Have we already seen one of these relocations? */
 /* FIXME: we could look in other sections, too --RR */
 static int