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

Merge branch 'tip/perf/urgent' of... 

Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
parents b1d2dc3c b1cff0ad

arch/blackfin/mm/maccess.c

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ static int validate_memory_access_address(unsigned long addr, int size) 
	return bfin_mem_access_type(addr, size);

}



long probe_kernel_read(void *dst, void *src, size_t size)

long probe_kernel_read(void *dst, const void *src, size_t size)

{

	unsigned long lsrc = (unsigned long)src;

	int mem_type;
@@ -55,7 +55,7 @@ long probe_kernel_read(void *dst, void *src, size_t size) 
	return -EFAULT;

}



long probe_kernel_write(void *dst, void *src, size_t size)

long probe_kernel_write(void *dst, const void *src, size_t size)

{

	unsigned long ldst = (unsigned long)dst;

	int mem_type;

arch/s390/mm/maccess.c

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
 * using the stura instruction.

 * Returns the number of bytes copied or -EFAULT.

 */

static long probe_kernel_write_odd(void *dst, void *src, size_t size)

static long probe_kernel_write_odd(void *dst, const void *src, size_t size)

{

	unsigned long count, aligned;

	int offset, mask;
@@ -45,7 +45,7 @@ static long probe_kernel_write_odd(void *dst, void *src, size_t size) 
	return rc ? rc : count;

}



long probe_kernel_write(void *dst, void *src, size_t size)

long probe_kernel_write(void *dst, const void *src, size_t size)

{

	long copied = 0;

arch/x86/kernel/ftrace.c

+6 −6
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr) 
static atomic_t nmi_running = ATOMIC_INIT(0);

static int mod_code_status;		/* holds return value of text write */

static void *mod_code_ip;		/* holds the IP to write to */

static void *mod_code_newcode;		/* holds the text to write to the IP */

static const void *mod_code_newcode;	/* holds the text to write to the IP */



static unsigned nmi_wait_count;

static atomic_t nmi_update_count = ATOMIC_INIT(0);
@@ -225,7 +225,7 @@ within(unsigned long addr, unsigned long start, unsigned long end) 
}



static int

do_ftrace_mod_code(unsigned long ip, void *new_code)

do_ftrace_mod_code(unsigned long ip, const void *new_code)

{

	/*

	 * On x86_64, kernel text mappings are mapped read-only with
@@ -266,8 +266,8 @@ static const unsigned char *ftrace_nop_replace(void) 
}



static int

ftrace_modify_code(unsigned long ip, unsigned char *old_code,

		   unsigned char *new_code)

ftrace_modify_code(unsigned long ip, unsigned const char *old_code,

		   unsigned const char *new_code)

{

	unsigned char replaced[MCOUNT_INSN_SIZE];
@@ -301,7 +301,7 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code, 
int ftrace_make_nop(struct module *mod,

		    struct dyn_ftrace *rec, unsigned long addr)

{

	unsigned char *new, *old;

	unsigned const char *new, *old;

	unsigned long ip = rec->ip;



	old = ftrace_call_replace(ip, addr);
@@ -312,7 +312,7 @@ int ftrace_make_nop(struct module *mod, 


int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)

{

	unsigned char *new, *old;

	unsigned const char *new, *old;

	unsigned long ip = rec->ip;



	old = ftrace_nop_replace();

include/linux/ftrace_event.h

+12 −0
Original line number Diff line number Diff line
@@ -16,6 +16,11 @@ struct trace_print_flags { 
	const char		*name;

};



struct trace_print_flags_u64 {

	unsigned long long	mask;

	const char		*name;

};



const char *ftrace_print_flags_seq(struct trace_seq *p, const char *delim,

				   unsigned long flags,

				   const struct trace_print_flags *flag_array);
@@ -23,6 +28,13 @@ const char *ftrace_print_flags_seq(struct trace_seq *p, const char *delim, 
const char *ftrace_print_symbols_seq(struct trace_seq *p, unsigned long val,

				     const struct trace_print_flags *symbol_array);



#if BITS_PER_LONG == 32

const char *ftrace_print_symbols_seq_u64(struct trace_seq *p,

					 unsigned long long val,

					 const struct trace_print_flags_u64

								 *symbol_array);

#endif



const char *ftrace_print_hex_seq(struct trace_seq *p,

				 const unsigned char *buf, int len);

include/linux/sched.h

+1 −1
Original line number Diff line number Diff line
@@ -1535,7 +1535,7 @@ struct task_struct { 
#ifdef CONFIG_TRACING

	/* state flags for use by tracers */

	unsigned long trace;

	/* bitmask of trace recursion */

	/* bitmask and counter of trace recursion */

	unsigned long trace_recursion;

#endif /* CONFIG_TRACING */

#ifdef CONFIG_CGROUP_MEM_RES_CTLR /* memcg uses this to do batch job */