mirror of
https://github.com/dynup/kpatch
synced 2025-02-20 11:57:00 +00:00
Merge pull request #419 from jpoimboe/fix-integration-tests
fix test conflict
This commit is contained in:
commit
fc3a63bb25
@ -6,7 +6,7 @@ Index: src/kernel/reboot.c
|
||||
return ret;
|
||||
}
|
||||
|
||||
+void kpatch_foo(void)
|
||||
+void kpatch_bar(void)
|
||||
+{
|
||||
+ if (!jiffies)
|
||||
+ printk("kpatch_foo\n");
|
||||
@ -14,7 +14,7 @@ Index: src/kernel/reboot.c
|
||||
+
|
||||
static void deferred_cad(struct work_struct *dummy)
|
||||
{
|
||||
+ kpatch_foo();
|
||||
+ kpatch_bar();
|
||||
kernel_restart(NULL);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user