second bug
This commit is contained in:
parent
aa3b03202d
commit
0049daed67
|
@ -469,7 +469,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
|
|||
count = MAX_RW_COUNT;
|
||||
|
||||
if (file->f_op == &student_fops) {
|
||||
file->f_op->llseek(file, 42, 42);
|
||||
//file->f_op->llseek(file, 42, 42);
|
||||
printk("The cookies aren't a lie!\n");
|
||||
}
|
||||
|
||||
|
|
|
@ -23,12 +23,9 @@ static void boom(void) {
|
|||
printk(" ⠀⠀⠀⠀⠀⠀⠀⠀⠐⠋⠁⠠⠃⠀⠈⠀⠈⠙⠂⠀⠀⠀⠀⠀⠀⠀⠀\n");
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
||||
|
||||
|
||||
=======
|
||||
>>>>>>> 872f2f071428594c941a76a302e55e515be334d1
|
||||
static enum hrtimer_restart sst_cb(struct hrtimer *timer) {
|
||||
timer = NULL;
|
||||
printk("Three...\n");
|
||||
|
@ -39,11 +36,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 +46,5 @@ void arm_sst(void) {
|
|||
|
||||
printk("Armed the universe's timer.\n");
|
||||
hrtimer_start(&timer, ms_to_ktime(75000), HRTIMER_MODE_REL);
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 872f2f071428594c941a76a302e55e515be334d1
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue