Merge branch 'core/softirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core/softirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: softirq: remove irqs_disabled warning from local_bh_enable softirq: remove initialization of static per-cpu variable Remove argument from open_softirq which is always NULL
This commit is contained in:
@@ -4585,8 +4585,8 @@ static int __init net_dev_init(void)
|
||||
|
||||
dev_boot_phase = 0;
|
||||
|
||||
open_softirq(NET_TX_SOFTIRQ, net_tx_action, NULL);
|
||||
open_softirq(NET_RX_SOFTIRQ, net_rx_action, NULL);
|
||||
open_softirq(NET_TX_SOFTIRQ, net_tx_action);
|
||||
open_softirq(NET_RX_SOFTIRQ, net_rx_action);
|
||||
|
||||
hotcpu_notifier(dev_cpu_callback, 0);
|
||||
dst_init();
|
||||
|
Reference in New Issue
Block a user