mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 14:44:12 +00:00
Code Issues Releases Wiki Activity

treewide: Replace DECLARE_TASKLET() with DECLARE_TASKLET_OLD()

Browse source 
[ Upstream commit b13fecb1c3 ]

This converts all the existing DECLARE_TASKLET() (and ...DISABLED)
macros with DECLARE_TASKLET_OLD() in preparation for refactoring the
tasklet callback type. All existing DECLARE_TASKLET() users had a "0"
data argument, it has been removed here as well.

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Kees Cook <keescook@chromium.org>
Stable-dep-of: 1fdeb8b9f2 ("wifi: iwl3945: Add missing check for create_singlethread_workqueue")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Kees Cook 2020-07-13 15:01:26 -07:00 committed by Greg Kroah-Hartman
parent 9198eefd10
commit 5de7a4254e
16 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/input/keyboard/omap-keypad.c
View file

@ -46,7 +46,7 @@ struct omap_kp {
unsigned short keymap[]; unsigned short keymap[];
}; };
static DECLARE_TASKLET_DISABLED(kp_tasklet, omap_kp_tasklet, 0); static DECLARE_TASKLET_DISABLED_OLD(kp_tasklet, omap_kp_tasklet);
static unsigned int *row_gpios; static unsigned int *row_gpios;
static unsigned int *col_gpios; static unsigned int *col_gpios;

2
drivers/input/serio/hil_mlc.c
View file

@ -77,7 +77,7 @@ static struct timer_list hil_mlcs_kicker;
static int hil_mlcs_probe, hil_mlc_stop; static int hil_mlcs_probe, hil_mlc_stop;
static void hil_mlcs_process(unsigned long unused); static void hil_mlcs_process(unsigned long unused);
static DECLARE_TASKLET_DISABLED(hil_mlcs_tasklet, hil_mlcs_process, 0); static DECLARE_TASKLET_DISABLED_OLD(hil_mlcs_tasklet, hil_mlcs_process);
/* #define HIL_MLC_DEBUG */ /* #define HIL_MLC_DEBUG */

4
drivers/net/wan/farsync.c
View file

@ -569,8 +569,8 @@ static void do_bottom_half_rx(struct fst_card_info *card);
static void fst_process_tx_work_q(unsigned long work_q); static void fst_process_tx_work_q(unsigned long work_q);
static void fst_process_int_work_q(unsigned long work_q); static void fst_process_int_work_q(unsigned long work_q);
static DECLARE_TASKLET(fst_tx_task, fst_process_tx_work_q, 0); static DECLARE_TASKLET_OLD(fst_tx_task, fst_process_tx_work_q);
static DECLARE_TASKLET(fst_int_task, fst_process_int_work_q, 0); static DECLARE_TASKLET_OLD(fst_int_task, fst_process_int_work_q);
static struct fst_card_info *fst_card_array[FST_MAX_CARDS]; static struct fst_card_info *fst_card_array[FST_MAX_CARDS];
static spinlock_t fst_work_q_lock; static spinlock_t fst_work_q_lock;

2
drivers/s390/crypto/ap_bus.c
View file

@ -91,7 +91,7 @@ static DECLARE_WORK(ap_scan_work, ap_scan_bus);
* Tasklet & timer for AP request polling and interrupts * Tasklet & timer for AP request polling and interrupts
*/ */
static void ap_tasklet_fn(unsigned long); static void ap_tasklet_fn(unsigned long);
static DECLARE_TASKLET(ap_tasklet, ap_tasklet_fn, 0); static DECLARE_TASKLET_OLD(ap_tasklet, ap_tasklet_fn);
static DECLARE_WAIT_QUEUE_HEAD(ap_poll_wait); static DECLARE_WAIT_QUEUE_HEAD(ap_poll_wait);
static struct task_struct *ap_poll_kthread; static struct task_struct *ap_poll_kthread;
static DEFINE_MUTEX(ap_poll_thread_mutex); static DEFINE_MUTEX(ap_poll_thread_mutex);

2
drivers/staging/most/dim2/dim2.c
View file

@ -47,7 +47,7 @@ MODULE_PARM_DESC(fcnt, "Num of frames per sub-buffer for sync channels as a powe
static DEFINE_SPINLOCK(dim_lock); static DEFINE_SPINLOCK(dim_lock);
static void dim2_tasklet_fn(unsigned long data); static void dim2_tasklet_fn(unsigned long data);
static DECLARE_TASKLET(dim2_tasklet, dim2_tasklet_fn, 0); static DECLARE_TASKLET_OLD(dim2_tasklet, dim2_tasklet_fn);
/** /**
* struct hdm_channel - private structure to keep channel specific data * struct hdm_channel - private structure to keep channel specific data

2
drivers/staging/octeon/ethernet-tx.c
View file

@ -41,7 +41,7 @@
#endif #endif
static void cvm_oct_tx_do_cleanup(unsigned long arg); static void cvm_oct_tx_do_cleanup(unsigned long arg);
static DECLARE_TASKLET(cvm_oct_tx_cleanup_tasklet, cvm_oct_tx_do_cleanup, 0); static DECLARE_TASKLET_OLD(cvm_oct_tx_cleanup_tasklet, cvm_oct_tx_do_cleanup);
/* Maximum number of SKBs to try to free per xmit packet. */ /* Maximum number of SKBs to try to free per xmit packet. */
#define MAX_SKB_TO_FREE (MAX_OUT_QUEUE_DEPTH * 2) #define MAX_SKB_TO_FREE (MAX_OUT_QUEUE_DEPTH * 2)

2
drivers/tty/vt/keyboard.c
View file

@ -1241,7 +1241,7 @@ static void kbd_bh(unsigned long dummy)
} }
} }
DECLARE_TASKLET_DISABLED(keyboard_tasklet, kbd_bh, 0); DECLARE_TASKLET_DISABLED_OLD(keyboard_tasklet, kbd_bh);
#if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_ALPHA) ||\ #if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_ALPHA) ||\
defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC) ||\ defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC) ||\

2
drivers/usb/gadget/udc/snps_udc_core.c
View file

@ -96,7 +96,7 @@ static int stop_pollstall_timer;
static DECLARE_COMPLETION(on_pollstall_exit); static DECLARE_COMPLETION(on_pollstall_exit);
/* tasklet for usb disconnect */ /* tasklet for usb disconnect */
static DECLARE_TASKLET(disconnect_tasklet, udc_tasklet_disconnect, 0); static DECLARE_TASKLET_OLD(disconnect_tasklet, udc_tasklet_disconnect);
/* endpoint names used for print */ /* endpoint names used for print */
static const char ep0_string[] = "ep0in"; static const char ep0_string[] = "ep0in";

2
drivers/usb/host/fhci-sched.c
View file

@ -677,7 +677,7 @@ static void process_done_list(unsigned long data)
enable_irq(fhci_to_hcd(fhci)->irq); enable_irq(fhci_to_hcd(fhci)->irq);
} }
DECLARE_TASKLET(fhci_tasklet, process_done_list, 0); DECLARE_TASKLET_OLD(fhci_tasklet, process_done_list);
/* transfer complted callback */ /* transfer complted callback */
u32 fhci_transfer_confirm_callback(struct fhci_hcd *fhci) u32 fhci_transfer_confirm_callback(struct fhci_hcd *fhci)

15
include/linux/interrupt.h
View file

@ -598,12 +598,17 @@ struct tasklet_struct
unsigned long data; unsigned long data;
}; };
#define DECLARE_TASKLET(name, func, data) \ #define DECLARE_TASKLET_OLD(name, _func) \
struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(0), func, data } struct tasklet_struct name = { \
.count = ATOMIC_INIT(0), \
#define DECLARE_TASKLET_DISABLED(name, func, data) \ .func = _func, \
struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(1), func, data } }
#define DECLARE_TASKLET_DISABLED_OLD(name, _func) \
struct tasklet_struct name = { \
.count = ATOMIC_INIT(1), \
.func = _func, \
}
enum enum
{ {

2
kernel/backtracetest.c
View file

@ -29,7 +29,7 @@ static void backtrace_test_irq_callback(unsigned long data)
complete(&backtrace_work); complete(&backtrace_work);
} }
static DECLARE_TASKLET(backtrace_tasklet, &backtrace_test_irq_callback, 0); static DECLARE_TASKLET_OLD(backtrace_tasklet, &backtrace_test_irq_callback);
static void backtrace_test_irq(void) static void backtrace_test_irq(void)
{ {

2
kernel/debug/debug_core.c
View file

@ -1043,7 +1043,7 @@ static void kgdb_tasklet_bpt(unsigned long ing)
atomic_set(&kgdb_break_tasklet_var, 0); atomic_set(&kgdb_break_tasklet_var, 0);
} }
static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0); static DECLARE_TASKLET_OLD(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt);
void kgdb_schedule_breakpoint(void) void kgdb_schedule_breakpoint(void)
{ {

2
kernel/irq/resend.c
View file

@ -45,7 +45,7 @@ static void resend_irqs(unsigned long arg)
} }
/* Tasklet to handle resend: */ /* Tasklet to handle resend: */
static DECLARE_TASKLET(resend_tasklet, resend_irqs, 0); static DECLARE_TASKLET_OLD(resend_tasklet, resend_irqs);
#endif #endif

2
net/atm/pppoatm.c
View file

@ -393,7 +393,7 @@ static int pppoatm_assign_vcc(struct atm_vcc *atmvcc, void __user *arg)
* Each PPPoATM instance has its own tasklet - this is just a * Each PPPoATM instance has its own tasklet - this is just a
* prototypical one used to initialize them * prototypical one used to initialize them
*/ */
static const DECLARE_TASKLET(tasklet_proto, pppoatm_wakeup_sender, 0); static const DECLARE_TASKLET_OLD(tasklet_proto, pppoatm_wakeup_sender);
if (copy_from_user(&be, arg, sizeof be)) if (copy_from_user(&be, arg, sizeof be))
return -EFAULT; return -EFAULT;
if (be.encaps != PPPOATM_ENCAPS_AUTODETECT && if (be.encaps != PPPOATM_ENCAPS_AUTODETECT &&

2
net/iucv/iucv.c
View file

@ -128,7 +128,7 @@ static LIST_HEAD(iucv_task_queue);
* The tasklet for fast delivery of iucv interrupts. * The tasklet for fast delivery of iucv interrupts.
*/ */
static void iucv_tasklet_fn(unsigned long); static void iucv_tasklet_fn(unsigned long);
static DECLARE_TASKLET(iucv_tasklet, iucv_tasklet_fn,0); static DECLARE_TASKLET_OLD(iucv_tasklet, iucv_tasklet_fn);
/* /*
* Queue of interrupt buffers for delivery via a work queue * Queue of interrupt buffers for delivery via a work queue

2
sound/drivers/pcsp/pcsp_lib.c
View file

@ -36,7 +36,7 @@ static void pcsp_call_pcm_elapsed(unsigned long priv)
} }
} }
static DECLARE_TASKLET(pcsp_pcm_tasklet, pcsp_call_pcm_elapsed, 0); static DECLARE_TASKLET_OLD(pcsp_pcm_tasklet, pcsp_call_pcm_elapsed);
/* write the port and returns the next expire time in ns; /* write the port and returns the next expire time in ns;
* called at the trigger-start and in hrtimer callback * called at the trigger-start and in hrtimer callback