Skip to content

Commit

Permalink
Merge develop into ext2-free-inode
Browse files Browse the repository at this point in the history
  • Loading branch information
Galfurian committed Mar 20, 2024
2 parents b685004 + 377a9da commit 9e1a6c8
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ jobs:
cmake --build build --parallel 2
test:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- name: Clone repository
uses: actions/checkout@v4
Expand Down
10 changes: 7 additions & 3 deletions mentos/src/hardware/timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -422,10 +422,14 @@ void run_timer_softirq(void)
list_for_each_safe (it, tmp, &base->tv1.vec[current_time_index]) {
struct timer_list *timer = list_entry(it, struct timer_list, entry);

// Executes timer function
spinlock_unlock(&base->lock);
pr_debug("Executing dynamic timer function...\n");
timer->function(timer->data);
// Executes timer function
if (timer->function) {
pr_debug("Executing dynamic timer function...\n");
timer->function(timer->data);
} else {
pr_alert("Dynamic timer function is NULL...\n");
}
spinlock_lock(&base->lock);

// Removes timer from list
Expand Down
1 change: 0 additions & 1 deletion programs/cat.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,5 @@ int main(int argc, char **argv)
ret = EXIT_FAILURE;
}
}
putchar('\n');
return ret;
}
2 changes: 1 addition & 1 deletion programs/runtests.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
static char *all_tests[] = {
"t_abort",
"t_alarm",
// "t_big_write",
/* "t_big_write", */
"t_creat",
"t_dup",
"t_exec execl",
Expand Down

0 comments on commit 9e1a6c8

Please sign in to comment.