Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

+20
+18
kernel/panic.c
··· 19 19 #include <linux/nmi.h> 20 20 #include <linux/kexec.h> 21 21 #include <linux/debug_locks.h> 22 + #include <linux/random.h> 22 23 23 24 int panic_on_oops; 24 25 int tainted; ··· 267 266 } 268 267 269 268 /* 269 + * 64-bit random ID for oopses: 270 + */ 271 + static u64 oops_id; 272 + 273 + static int init_oops_id(void) 274 + { 275 + if (!oops_id) 276 + get_random_bytes(&oops_id, sizeof(oops_id)); 277 + 278 + return 0; 279 + } 280 + late_initcall(init_oops_id); 281 + 282 + /* 270 283 * Called when the architecture exits its oops handler, after printing 271 284 * everything. 272 285 */ 273 286 void oops_exit(void) 274 287 { 275 288 do_oops_enter_exit(); 289 + init_oops_id(); 290 + printk(KERN_WARNING "---[ end trace %016llx ]---\n", 291 + (unsigned long long)oops_id); 276 292 } 277 293 278 294 #ifdef CONFIG_CC_STACKPROTECTOR
+2
kernel/sched_rt.c
··· 208 208 209 209 static void task_tick_rt(struct rq *rq, struct task_struct *p) 210 210 { 211 + update_curr_rt(rq); 212 + 211 213 /* 212 214 * RR tasks need a special form of timeslice management. 213 215 * FIFO tasks have no timeslices.