fix test conflict

I accidentally added two tests which both create a non-static
kpatch_foo() function, which breaks the combined integration test kernel
build.
This commit is contained in:
Josh Poimboeuf 2014-09-12 13:04:42 -05:00
parent 114b21c7e5
commit dacdfcfd22

View File

@ -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);
}