Commit faa4877f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched 

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
  debug: add end-of-oops marker
  sched: rt: account the cpu time during the tick
parents 17eb2c3b 2c3b20e9

kernel/panic.c

+18 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/nmi.h>

#include <linux/kexec.h>

#include <linux/debug_locks.h>

#include <linux/random.h>



int panic_on_oops;

int tainted;
@@ -265,6 +266,20 @@ void oops_enter(void) 
	do_oops_enter_exit();

}



/*

 * 64-bit random ID for oopses:

 */

static u64 oops_id;



static int init_oops_id(void)

{

	if (!oops_id)

		get_random_bytes(&oops_id, sizeof(oops_id));



	return 0;

}

late_initcall(init_oops_id);



/*

 * Called when the architecture exits its oops handler, after printing

 * everything.
@@ -272,6 +287,9 @@ void oops_enter(void) 
void oops_exit(void)

{

	do_oops_enter_exit();

	init_oops_id();

	printk(KERN_WARNING "---[ end trace %016llx ]---\n",

		(unsigned long long)oops_id);

}



#ifdef CONFIG_CC_STACKPROTECTOR

kernel/sched_rt.c

+2 −0
Original line number Diff line number Diff line
@@ -208,6 +208,8 @@ move_one_task_rt(struct rq *this_rq, int this_cpu, struct rq *busiest, 


static void task_tick_rt(struct rq *rq, struct task_struct *p)

{

	update_curr_rt(rq);



	/*

	 * RR tasks need a special form of timeslice management.

	 * FIFO tasks have no timeslices.