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

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

Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core 



Pull oprofile fixes from Robert Richter.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents ded86e7c 61bccf19

arch/s390/oprofile/init.c

+5 −5
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static ssize_t hw_interval_write(struct file *file, char const __user *buf, 
	if (*offset)

		return -EINVAL;

	retval = oprofilefs_ulong_from_user(&val, buf, count);

	if (retval)

	if (retval <= 0)

		return retval;

	if (val < oprofile_min_interval)

		oprofile_hw_interval = oprofile_min_interval;
@@ -212,7 +212,7 @@ static ssize_t hwsampler_zero_write(struct file *file, char const __user *buf, 
		return -EINVAL;



	retval = oprofilefs_ulong_from_user(&val, buf, count);

	if (retval)

	if (retval <= 0)

		return retval;

	if (val != 0)

		return -EINVAL;
@@ -243,7 +243,7 @@ static ssize_t hwsampler_kernel_write(struct file *file, char const __user *buf, 
		return -EINVAL;



	retval = oprofilefs_ulong_from_user(&val, buf, count);

	if (retval)

	if (retval <= 0)

		return retval;



	if (val != 0 && val != 1)
@@ -278,7 +278,7 @@ static ssize_t hwsampler_user_write(struct file *file, char const __user *buf, 
		return -EINVAL;



	retval = oprofilefs_ulong_from_user(&val, buf, count);

	if (retval)

	if (retval <= 0)

		return retval;



	if (val != 0 && val != 1)
@@ -317,7 +317,7 @@ static ssize_t timer_enabled_write(struct file *file, char const __user *buf, 
		return -EINVAL;



	retval = oprofilefs_ulong_from_user(&val, buf, count);

	if (retval)

	if (retval <= 0)

		return retval;



	if (val != 0 && val != 1)

drivers/oprofile/cpu_buffer.c

+3 −8
Original line number Diff line number Diff line
@@ -451,15 +451,10 @@ static void wq_sync_buffer(struct work_struct *work) 
{

	struct oprofile_cpu_buffer *b =

		container_of(work, struct oprofile_cpu_buffer, work.work);

	if (b->cpu != smp_processor_id()) {

		printk(KERN_DEBUG "WQ on CPU%d, prefer CPU%d\n",

		       smp_processor_id(), b->cpu);



		if (!cpu_online(b->cpu)) {

	if (b->cpu != smp_processor_id() && !cpu_online(b->cpu)) {

		cancel_delayed_work(&b->work);

		return;

	}

	}

	sync_buffer(b->cpu);



	/* don't re-add the work if we're shutting down */