Commit d949750f 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 ce677831 e63233f7

kernel/trace/trace.c

+9 −1
Original line number Diff line number Diff line
@@ -2338,11 +2338,19 @@ tracing_write_stub(struct file *filp, const char __user *ubuf, 
	return count;

}



static loff_t tracing_seek(struct file *file, loff_t offset, int origin)

{

	if (file->f_mode & FMODE_READ)

		return seq_lseek(file, offset, origin);

	else

		return 0;

}



static const struct file_operations tracing_fops = {

	.open		= tracing_open,

	.read		= seq_read,

	.write		= tracing_write_stub,

	.llseek		= seq_lseek,

	.llseek		= tracing_seek,

	.release	= tracing_release,

};

scripts/recordmcount.h

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static uint_t (*Elf_r_sym)(Elf_Rel const *rp) = fn_ELF_R_SYM; 


static void fn_ELF_R_INFO(Elf_Rel *const rp, unsigned sym, unsigned type)

{

	rp->r_info = ELF_R_INFO(sym, type);

	rp->r_info = _w(ELF_R_INFO(sym, type));

}

static void (*Elf_r_info)(Elf_Rel *const rp, unsigned sym, unsigned type) = fn_ELF_R_INFO;

scripts/tags.sh

+3 −1
Original line number Diff line number Diff line
@@ -125,7 +125,9 @@ exuberant() 
	-I DEFINE_TRACE,EXPORT_TRACEPOINT_SYMBOL,EXPORT_TRACEPOINT_SYMBOL_GPL \

	--extra=+f --c-kinds=-px                                \

	--regex-asm='/^ENTRY\(([^)]*)\).*/\1/'                  \

	--regex-c='/^SYSCALL_DEFINE[[:digit:]]?\(([^,)]*).*/sys_\1/'

	--regex-c='/^SYSCALL_DEFINE[[:digit:]]?\(([^,)]*).*/sys_\1/' \

	--regex-c++='/^TRACE_EVENT\(([^,)]*).*/trace_\1/'		\

	--regex-c++='/^DEFINE_EVENT\(([^,)]*).*/trace_\1/'



	all_kconfigs | xargs $1 -a                              \

	--langdef=kconfig --language-force=kconfig              \