Merge branch 'akpm' (patches from Andrew)
Merge more updates from Andrew Morton: - a few block updates that fell in my lap - lib/ updates - checkpatch - autofs - ipc - a ton of misc other things * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (100 commits) mm: split gfp_mask and mapping flags into separate fields fs: use mapping_set_error instead of opencoded set_bit treewide: remove redundant #include <linux/kconfig.h> hung_task: allow hung_task_panic when hung_task_warnings is 0 kthread: add kerneldoc for kthread_create() kthread: better support freezable kthread workers kthread: allow to modify delayed kthread work kthread: allow to cancel kthread work kthread: initial support for delayed kthread work kthread: detect when a kthread work is used by more workers kthread: add kthread_destroy_worker() kthread: add kthread_create_worker*() kthread: allow to call __kthread_create_on_node() with va_list args kthread/smpboot: do not park in kthread_create_on_cpu() kthread: kthread worker API cleanup kthread: rename probe_kthread_data() to kthread_probe_data() scripts/tags.sh: enable code completion in VIM mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping kdump, vmcoreinfo: report memory sections virtual addresses ipc/sem.c: add cond_resched in exit_sme ...
Цей коміт міститься в:
@@ -20,8 +20,6 @@
|
||||
#ifndef __ALTERA_CI_H
|
||||
#define __ALTERA_CI_H
|
||||
|
||||
#include <linux/kconfig.h>
|
||||
|
||||
#define ALT_DATA 0x000000ff
|
||||
#define ALT_TDI 0x00008000
|
||||
#define ALT_TDO 0x00004000
|
||||
|
@@ -750,7 +750,7 @@ static int ivtv_init_struct1(struct ivtv *itv)
|
||||
spin_lock_init(&itv->lock);
|
||||
spin_lock_init(&itv->dma_reg_lock);
|
||||
|
||||
init_kthread_worker(&itv->irq_worker);
|
||||
kthread_init_worker(&itv->irq_worker);
|
||||
itv->irq_worker_task = kthread_run(kthread_worker_fn, &itv->irq_worker,
|
||||
"%s", itv->v4l2_dev.name);
|
||||
if (IS_ERR(itv->irq_worker_task)) {
|
||||
@@ -760,7 +760,7 @@ static int ivtv_init_struct1(struct ivtv *itv)
|
||||
/* must use the FIFO scheduler as it is realtime sensitive */
|
||||
sched_setscheduler(itv->irq_worker_task, SCHED_FIFO, ¶m);
|
||||
|
||||
init_kthread_work(&itv->irq_work, ivtv_irq_work_handler);
|
||||
kthread_init_work(&itv->irq_work, ivtv_irq_work_handler);
|
||||
|
||||
/* Initial settings */
|
||||
itv->cxhdl.port = CX2341X_PORT_MEMORY;
|
||||
@@ -1441,7 +1441,7 @@ static void ivtv_remove(struct pci_dev *pdev)
|
||||
del_timer_sync(&itv->dma_timer);
|
||||
|
||||
/* Kill irq worker */
|
||||
flush_kthread_worker(&itv->irq_worker);
|
||||
kthread_flush_worker(&itv->irq_worker);
|
||||
kthread_stop(itv->irq_worker_task);
|
||||
|
||||
ivtv_streams_cleanup(itv);
|
||||
|
@@ -1062,7 +1062,7 @@ irqreturn_t ivtv_irq_handler(int irq, void *dev_id)
|
||||
}
|
||||
|
||||
if (test_and_clear_bit(IVTV_F_I_HAVE_WORK, &itv->i_flags)) {
|
||||
queue_kthread_work(&itv->irq_worker, &itv->irq_work);
|
||||
kthread_queue_work(&itv->irq_worker, &itv->irq_work);
|
||||
}
|
||||
|
||||
spin_unlock(&itv->dma_reg_lock);
|
||||
|
Посилання в новій задачі
Заблокувати користувача