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

Commit 3386c05b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  debugobjects: add and use INIT_WORK_ON_STACK
  rcu: remove duplicate CONFIG_RCU_CPU_STALL_DETECTOR
  relay: fix lock imbalance in relay_late_setup_files
  oprofile: fix uninitialized use of struct op_entry
  rcu: move Kconfig menu
  softlock: fix false panic which can occur if softlockup_thresh is reduced
  rcu: add __cpuinit to rcu_init_percpu_data()
parents 1e70c7f7 6552ebae

arch/x86/kernel/hpet.c

+1 −0
Original line number Diff line number Diff line
@@ -633,6 +633,7 @@ static int hpet_cpuhp_notify(struct notifier_block *n, 
		/* FIXME: add schedule_work_on() */

		schedule_delayed_work_on(cpu, &work.work, 0);

		wait_for_completion(&work.complete);

		destroy_timer_on_stack(&work.work.timer);

		break;

	case CPU_DEAD:

		if (hdev) {

drivers/oprofile/cpu_buffer.c

+5 −0
Original line number Diff line number Diff line
@@ -393,16 +393,21 @@ oprofile_write_reserve(struct op_entry *entry, struct pt_regs * const regs, 
	return;



fail:

	entry->event = NULL;

	cpu_buf->sample_lost_overflow++;

}



int oprofile_add_data(struct op_entry *entry, unsigned long val)

{

	if (!entry->event)

		return 0;

	return op_cpu_buffer_add_data(entry, val);

}



int oprofile_write_commit(struct op_entry *entry)

{

	if (!entry->event)

		return -EINVAL;

	return op_cpu_buffer_write_commit(entry);

}

drivers/oprofile/cpu_buffer.h

+7 −0
Original line number Diff line number Diff line
@@ -66,6 +66,13 @@ static inline void op_cpu_buffer_reset(int cpu) 
	cpu_buf->last_task = NULL;

}



/*

 * op_cpu_buffer_add_data() and op_cpu_buffer_write_commit() may be

 * called only if op_cpu_buffer_write_reserve() did not return NULL or

 * entry->event != NULL, otherwise entry->size or entry->event will be

 * used uninitialized.

 */



struct op_sample

*op_cpu_buffer_write_reserve(struct op_entry *entry, unsigned long size);

int op_cpu_buffer_write_commit(struct op_entry *entry);

include/linux/sched.h

+3 −0
Original line number Diff line number Diff line
@@ -293,6 +293,9 @@ extern void sched_show_task(struct task_struct *p); 
extern void softlockup_tick(void);

extern void touch_softlockup_watchdog(void);

extern void touch_all_softlockup_watchdogs(void);

extern int proc_dosoftlockup_thresh(struct ctl_table *table, int write,

				    struct file *filp, void __user *buffer,

				    size_t *lenp, loff_t *ppos);

extern unsigned int  softlockup_panic;

extern unsigned long sysctl_hung_task_check_count;

extern unsigned long sysctl_hung_task_timeout_secs;

include/linux/workqueue.h

+6 −0
Original line number Diff line number Diff line
@@ -130,6 +130,12 @@ struct execute_work { 
		init_timer_deferrable(&(_work)->timer);		\

	} while (0)



#define INIT_DELAYED_WORK_ON_STACK(_work, _func)		\

	do {							\

		INIT_WORK(&(_work)->work, (_func));		\

		init_timer_on_stack(&(_work)->timer);		\

	} while (0)



/**

 * work_pending - Find out whether a work item is currently pending

 * @work: The work item in question