kernel/workqueue.c: fix merge