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

Compare commits

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

3 Commits
872f2f0714 ... aa3b03202d

Author SHA1 Message Date
Ulrich Bessoh aa3b03202d null pointer error 2024-07-16 16:14:20 +02:00
Ulrich Bessoh 5c9a25514f null pointer error 2024-07-16 16:02:48 +02:00
Ulrich Bessoh 16f5fafdf7 null pointer error 2024-07-16 15:50:57 +02:00
1 changed files with 14 additions and 0 deletions
Show Stats Expand all files Collapse all files

14
kernel/universe.c
View File

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