Commit a524446f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'tracing/ftrace', 'tracing/hw-breakpoints',... 

Merge branches 'tracing/ftrace', 'tracing/hw-breakpoints', 'tracing/ring-buffer', 'tracing/textedit' and 'linus' into tracing/core
parents 0cf53ff6 09c9e84d 505f2b97

kernel/extable.c

+12 −2
Original line number Diff line number Diff line
@@ -15,11 +15,21 @@ 
    along with this program; if not, write to the Free Software

    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

*/

#include <linux/ftrace.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/init.h>

#include <linux/ftrace.h>

#include <asm/uaccess.h>



#include <asm/sections.h>

#include <asm/uaccess.h>



/*

 * mutex protecting text section modification (dynamic code patching).

 * some users need to sleep (allocating memory...) while they hold this lock.

 *

 * NOT exported to modules - patching kernel text is a really delicate matter.

 */

DEFINE_MUTEX(text_mutex);



extern struct exception_table_entry __start___ex_table[];

extern struct exception_table_entry __stop___ex_table[];

kernel/trace/ring_buffer.c

+4 −4
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ static void rb_free_cpu_buffer(struct ring_buffer_per_cpu *cpu_buffer) 
extern int ring_buffer_page_too_big(void);



#ifdef CONFIG_HOTPLUG_CPU

static int __cpuinit rb_cpu_notify(struct notifier_block *self,

static int rb_cpu_notify(struct notifier_block *self,

			 unsigned long action, void *hcpu);

#endif
@@ -2784,7 +2784,7 @@ static __init int rb_init_debugfs(void) 
fs_initcall(rb_init_debugfs);



#ifdef CONFIG_HOTPLUG_CPU

static int __cpuinit rb_cpu_notify(struct notifier_block *self,

static int rb_cpu_notify(struct notifier_block *self,

			 unsigned long action, void *hcpu)

{

	struct ring_buffer *buffer =

mm/memory.c

+0 −8
Original line number Diff line number Diff line
@@ -101,14 +101,6 @@ int randomize_va_space __read_mostly = 
					2;

#endif



/*

 * mutex protecting text section modification (dynamic code patching).

 * some users need to sleep (allocating memory...) while they hold this lock.

 *

 * NOT exported to modules - patching kernel text is a really delicate matter.

 */

DEFINE_MUTEX(text_mutex);



static int __init disable_randmaps(char *s)

{

	randomize_va_space = 0;