kpatch/test/integration/gcc-static-local-var-3.patch
Josh Poimboeuf dacdfcfd22 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.
2014-09-12 13:12:36 -05:00

21 lines
404 B
Diff

Index: src/kernel/reboot.c
===================================================================
--- src.orig/kernel/reboot.c
+++ src/kernel/reboot.c
@@ -285,8 +285,15 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
return ret;
}
+void kpatch_bar(void)
+{
+ if (!jiffies)
+ printk("kpatch_foo\n");
+}
+
static void deferred_cad(struct work_struct *dummy)
{
+ kpatch_bar();
kernel_restart(NULL);
}