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

Commit 3d8b4bde authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-fixes-for-linus' of... 

Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf top: Fix help text alignment
  perf: Fix hypervisor sample reporting
  perf: Make bp_len type to u64 generic across the arch
parents 724e6d3f 1a72cfa6

include/linux/hw_breakpoint.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static inline int hw_breakpoint_type(struct perf_event *bp) 
	return bp->attr.bp_type;

}



static inline int hw_breakpoint_len(struct perf_event *bp)

static inline unsigned long hw_breakpoint_len(struct perf_event *bp)

{

	return bp->attr.bp_len;

}

include/linux/perf_event.h

+2 −4
Original line number Diff line number Diff line
@@ -211,11 +211,9 @@ struct perf_event_attr { 
		__u32		wakeup_watermark; /* bytes before wakeup   */

	};



	__u32			__reserved_2;



	__u64			bp_addr;

	__u32			bp_type;

	__u32			bp_len;

	__u64			bp_addr;

	__u64			bp_len;

};



/*

kernel/hw_breakpoint.c

+1 −1
Original line number Diff line number Diff line
@@ -360,8 +360,8 @@ EXPORT_SYMBOL_GPL(register_user_hw_breakpoint); 
int modify_user_hw_breakpoint(struct perf_event *bp, struct perf_event_attr *attr)

{

	u64 old_addr = bp->attr.bp_addr;

	u64 old_len = bp->attr.bp_len;

	int old_type = bp->attr.bp_type;

	int old_len = bp->attr.bp_len;

	int err = 0;



	perf_event_disable(bp);

kernel/perf_event.c

+1 −1
Original line number Diff line number Diff line
@@ -4580,7 +4580,7 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr, 
	if (attr->type >= PERF_TYPE_MAX)

		return -EINVAL;



	if (attr->__reserved_1 || attr->__reserved_2)

	if (attr->__reserved_1)

		return -EINVAL;



	if (attr->sample_type & ~(PERF_SAMPLE_MAX-1))

tools/perf/util/event.c

+2 −2
Original line number Diff line number Diff line
@@ -295,10 +295,10 @@ void thread__find_addr_location(struct thread *self, 
	al->thread = self;

	al->addr = addr;



	if (cpumode & PERF_RECORD_MISC_KERNEL) {

	if (cpumode == PERF_RECORD_MISC_KERNEL) {

		al->level = 'k';

		mg = &session->kmaps;

	} else if (cpumode & PERF_RECORD_MISC_USER)

	} else if (cpumode == PERF_RECORD_MISC_USER)

		al->level = '.';

	else {

		al->level = 'H';

tools/perf/builtin-top.c

+1 −1

File changed.

Contains only whitespace changes.