lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Linus Torvalds
2007-12-20 11:53:41 -08:00
parent 17eb2c3b56 2c3b20e91f
commit faa4877f02
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
kernel/panic.c
View File

@@ -19,6 +19,7 @@
#include <linux/nmi.h> #include <linux/nmi.h>
#include <linux/kexec.h> #include <linux/kexec.h>
#include <linux/debug_locks.h> #include <linux/debug_locks.h>
#include <linux/random.h>
int panic_on_oops; int panic_on_oops;
int tainted; int tainted;
@@ -265,6 +266,20 @@ void oops_enter(void)
do_oops_enter_exit(); 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 * Called when the architecture exits its oops handler, after printing
* everything. * everything.
@@ -272,6 +287,9 @@ void oops_enter(void)
void oops_exit(void) void oops_exit(void)
{ {
do_oops_enter_exit(); do_oops_enter_exit();
init_oops_id();
printk(KERN_WARNING "---[ end trace %016llx ]---\n",
(unsigned long long)oops_id);
} }
#ifdef CONFIG_CC_STACKPROTECTOR #ifdef CONFIG_CC_STACKPROTECTOR

2
kernel/sched_rt.c
View File

@@ -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) 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. * RR tasks need a special form of timeslice management.
* FIFO tasks have no timeslices. * FIFO tasks have no timeslices.