tresor.bessoh
/
linuxdebug
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: tresor.bessoh:aa3b03202d594115649b629422137cbb8141470c
Branches Tags
tresor.bessoh:master
..
compare: tresor.bessoh:872f2f071428594c941a76a302e55e515be334d1
Branches Tags
tresor.bessoh:master

No commits in common. "aa3b03202d594115649b629422137cbb8141470c" and "872f2f071428594c941a76a302e55e515be334d1" have entirely different histories.
aa3b03202d ... 872f2f0714

1 changed files with 0 additions and 14 deletions
Show Stats Expand all files Collapse all files

14
kernel/universe.c
View File

@ -23,12 +23,6 @@ static void boom(void) {
printk(" ⠀⠀⠀⠀⠀⠀⠀⠀⠐⠋⠁⠠⠃⠀⠈⠀⠈⠙⠂⠀⠀⠀⠀⠀⠀⠀⠀\n");
}
<<<<<<< HEAD
=======
>>>>>>> 872f2f071428594c941a76a302e55e515be334d1
static enum hrtimer_restart sst_cb(struct hrtimer *timer) {
timer = NULL;
printk("Three...\n");
@ -39,11 +33,7 @@ static enum hrtimer_restart sst_cb(struct hrtimer *timer) {
mdelay(1000);
boom();
// Marvin knows everything about cookies.
<<<<<<< HEAD
//timer->function = NULL;
=======
timer->function = NULL;
>>>>>>> 872f2f071428594c941a76a302e55e515be334d1
return HRTIMER_NORESTART;
}
@ -53,8 +43,4 @@ void arm_sst(void) {
printk("Armed the universe's timer.\n");
hrtimer_start(&timer, ms_to_ktime(75000), HRTIMER_MODE_REL);
<<<<<<< HEAD
=======
>>>>>>> 872f2f071428594c941a76a302e55e515be334d1
}