Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a62eaf15 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Add boot option to disable randomized mappings and cleanup 



AMD SimNow!'s JIT doesn't like them at all in the guest. For distribution
installation it's easiest if it's a boot time option.

Also I moved the variable to a more appropiate place and make
it independent from sysctl

And marked __read_mostly which it is.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 99019e91

Documentation/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -1638,6 +1638,9 @@ running once the system is up. 
			Format:

			<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]



	norandmaps	Don't use address space randomization

			Equivalent to echo 0 > /proc/sys/kernel/randomize_va_space





______________________________________________________________________

Changelog:

arch/i386/kernel/cpu/transmeta.c

+1 −0
Original line number Diff line number Diff line 
#include <linux/kernel.h>

#include <linux/mm.h>

#include <linux/init.h>

#include <asm/processor.h>

#include <asm/msr.h>

include/linux/kernel.h

+0 −6
Original line number Diff line number Diff line
@@ -326,12 +326,6 @@ struct sysinfo { 
/* Force a compilation error if condition is true */

#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))



#ifdef CONFIG_SYSCTL

extern int randomize_va_space;

#else

#define randomize_va_space 1

#endif



/* Trap pasters of __FUNCTION__ at compile-time */

#define __FUNCTION__ (__func__)

include/linux/mm.h

+2 −0
Original line number Diff line number Diff line
@@ -1051,5 +1051,7 @@ int shrink_slab(unsigned long scanned, gfp_t gfp_mask, 
void drop_pagecache(void);

void drop_slab(void);



extern int randomize_va_space;



#endif /* __KERNEL__ */

#endif /* _LINUX_MM_H */

kernel/sysctl.c

+0 −2
Original line number Diff line number Diff line
@@ -126,8 +126,6 @@ extern int sysctl_hz_timer; 
extern int acct_parm[];

#endif



int randomize_va_space = 1;



static int parse_table(int __user *, int, void __user *, size_t __user *, void __user *, size_t,

		       ctl_table *, void **);

static int proc_doutsstring(ctl_table *table, int write, struct file *filp,