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

Commit 80fe02b5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'sched-core-for-linus' and 'sched-urgent-for-linus' of... 

Merge branches 'sched-core-for-linus' and 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (60 commits)
  sched: Fix and optimise calculation of the weight-inverse
  sched: Avoid going ahead if ->cpus_allowed is not changed
  sched, rt: Update rq clock when unthrottling of an otherwise idle CPU
  sched: Remove unused parameters from sched_fork() and wake_up_new_task()
  sched: Shorten the construction of the span cpu mask of sched domain
  sched: Wrap the 'cfs_rq->nr_spread_over' field with CONFIG_SCHED_DEBUG
  sched: Remove unused 'this_best_prio arg' from balance_tasks()
  sched: Remove noop in alloc_rt_sched_group()
  sched: Get rid of lock_depth
  sched: Remove obsolete comment from scheduler_tick()
  sched: Fix sched_domain iterations vs. RCU
  sched: Next buddy hint on sleep and preempt path
  sched: Make set_*_buddy() work on non-task entities
  sched: Remove need_migrate_task()
  sched: Move the second half of ttwu() to the remote cpu
  sched: Restructure ttwu() some more
  sched: Rename ttwu_post_activation() to ttwu_do_wakeup()
  sched: Remove rq argument from ttwu_stat()
  sched: Remove rq->lock from the first half of ttwu()
  sched: Drop rq->lock from sched_exec()
  ...

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: Fix rt_rq runtime leakage bug
parents df48d871 db670dac ec514c48

Documentation/trace/kprobetrace.txt

+0 −1
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ format: 
        field:unsigned char common_flags;       offset:2;       size:1; signed:0;

        field:unsigned char common_preempt_count;       offset:3; size:1;signed:0;

        field:int common_pid;   offset:4;       size:4; signed:1;

        field:int common_lock_depth;    offset:8;       size:4; signed:1;



        field:unsigned long __probe_ip; offset:12;      size:4; signed:0;

        field:int __probe_nargs;        offset:16;      size:4; signed:1;

arch/alpha/kernel/smp.c

+1 −2
Original line number Diff line number Diff line
@@ -585,8 +585,7 @@ handle_ipi(struct pt_regs *regs) 


		switch (which) {

		case IPI_RESCHEDULE:

			/* Reschedule callback.  Everything to be done

			   is done by the interrupt return path.  */

			scheduler_ipi();

			break;



		case IPI_CALL_FUNC:

arch/arm/kernel/smp.c

+1 −4
Original line number Diff line number Diff line
@@ -560,10 +560,7 @@ asmlinkage void __exception_irq_entry do_IPI(int ipinr, struct pt_regs *regs) 
		break;



	case IPI_RESCHEDULE:

		/*

		 * nothing more to do - eveything is

		 * done on the interrupt return path

		 */

		scheduler_ipi();

		break;



	case IPI_CALL_FUNC:

arch/blackfin/mach-common/smp.c

+3 −0
Original line number Diff line number Diff line
@@ -177,6 +177,9 @@ static irqreturn_t ipi_handler_int1(int irq, void *dev_instance) 
	while (msg_queue->count) {

		msg = &msg_queue->ipi_message[msg_queue->head];

		switch (msg->type) {

		case BFIN_IPI_RESCHEDULE:

			scheduler_ipi();

			break;

		case BFIN_IPI_CALL_FUNC:

			spin_unlock_irqrestore(&msg_queue->lock, flags);

			ipi_call_function(cpu, msg);

arch/cris/arch-v32/kernel/smp.c

+8 −5
Original line number Diff line number Diff line
@@ -342,6 +342,9 @@ irqreturn_t crisv32_ipi_interrupt(int irq, void *dev_id) 


	ipi = REG_RD(intr_vect, irq_regs[smp_processor_id()], rw_ipi);



	if (ipi.vector & IPI_SCHEDULE) {

		scheduler_ipi();

	}

	if (ipi.vector & IPI_CALL) {

		func(info);

	}