Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 401669 | Differences between
and this patch

Collapse All | Expand All

(-)arch/ia64/include/asm/page.h.orig (+5 lines)
Lines 55-60 Link Here
55
# define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
55
# define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
56
#endif /* CONFIG_HUGETLB_PAGE */
56
#endif /* CONFIG_HUGETLB_PAGE */
57
57
58
#ifdef CONFIG_PAX_KERNEXEC
59
#define ktla_ktva(addr)     (addr)
60
#define ktva_ktla(addr)     (addr)
61
#endif
62
58
#ifdef __ASSEMBLY__
63
#ifdef __ASSEMBLY__
59
# define __pa(x)		((x) - PAGE_OFFSET)
64
# define __pa(x)		((x) - PAGE_OFFSET)
60
# define __va(x)		((x) + PAGE_OFFSET)
65
# define __va(x)		((x) + PAGE_OFFSET)
(-)arch/ia64/kernel/module.c.orig (-3 / +23 lines)
Lines 304-317 Link Here
304
304
305
#endif /* !USE_BRL */
305
#endif /* !USE_BRL */
306
306
307
void *
307
#ifdef CONFIG_PAX_KERNEXEC
308
module_alloc (unsigned long size)
308
void *module_alloc(unsigned long size)
309
{
309
{
310
	if (!size)
310
	if (size == 0)
311
		return NULL;
311
		return NULL;
312
312
	return vmalloc(size);
313
	return vmalloc(size);
313
}
314
}
314
315
316
void *module_alloc_exec(unsigned long size)
317
#else
318
void *module_alloc(unsigned long size)
319
#endif
320
321
{
322
	if (size == 0)
323
		return NULL;
324
325
	return vmalloc_exec(size);
326
}
327
315
void
328
void
316
module_free (struct module *mod, void *module_region)
329
module_free (struct module *mod, void *module_region)
317
{
330
{
Lines 322-327 Link Here
322
	vfree(module_region);
335
	vfree(module_region);
323
}
336
}
324
337
338
#ifdef CONFIG_PAX_KERNEXEC
339
void module_free_exec(struct module *mod, void *module_region)
340
{
341
	module_free(mod, module_region);
342
}
343
#endif
344
325
/* Have we already seen one of these relocations? */
345
/* Have we already seen one of these relocations? */
326
/* FIXME: we could look in other sections, too --RR */
346
/* FIXME: we could look in other sections, too --RR */
327
static int
347
static int

Return to bug 401669