Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 666484f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d18bb9a5 ace7f1b7

block/blk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -2048,7 +2048,7 @@ int __init blk_dev_init(void) 
	for_each_possible_cpu(i)

		INIT_LIST_HEAD(&per_cpu(blk_cpu_done, i));



	open_softirq(BLOCK_SOFTIRQ, blk_done_softirq, NULL);

	open_softirq(BLOCK_SOFTIRQ, blk_done_softirq);

	register_hotcpu_notifier(&blk_cpu_notifier);



	return 0;

include/linux/interrupt.h

+1 −2
Original line number Diff line number Diff line
@@ -285,12 +285,11 @@ enum 
struct softirq_action

{

	void	(*action)(struct softirq_action *);

	void	*data;

};



asmlinkage void do_softirq(void);

asmlinkage void __do_softirq(void);

extern void open_softirq(int nr, void (*action)(struct softirq_action*), void *data);

extern void open_softirq(int nr, void (*action)(struct softirq_action *));

extern void softirq_init(void);

#define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)

extern void raise_softirq_irqoff(unsigned int nr);

kernel/hrtimer.c

+1 −1
Original line number Diff line number Diff line
@@ -1677,7 +1677,7 @@ void __init hrtimers_init(void) 
			  (void *)(long)smp_processor_id());

	register_cpu_notifier(&hrtimers_nb);

#ifdef CONFIG_HIGH_RES_TIMERS

	open_softirq(HRTIMER_SOFTIRQ, run_hrtimer_softirq, NULL);

	open_softirq(HRTIMER_SOFTIRQ, run_hrtimer_softirq);

#endif

}

kernel/rcuclassic.c

+1 −1
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ static void __cpuinit rcu_online_cpu(int cpu) 


	rcu_init_percpu_data(cpu, &rcu_ctrlblk, rdp);

	rcu_init_percpu_data(cpu, &rcu_bh_ctrlblk, bh_rdp);

	open_softirq(RCU_SOFTIRQ, rcu_process_callbacks, NULL);

	open_softirq(RCU_SOFTIRQ, rcu_process_callbacks);

}



static int __cpuinit rcu_cpu_notify(struct notifier_block *self,

kernel/rcupreempt.c

+1 −1
Original line number Diff line number Diff line
@@ -1119,7 +1119,7 @@ void __init __rcu_init(void) 
	for_each_online_cpu(cpu)

		rcu_cpu_notify(&rcu_nb, CPU_UP_PREPARE,	(void *)(long) cpu);



	open_softirq(RCU_SOFTIRQ, rcu_process_callbacks, NULL);

	open_softirq(RCU_SOFTIRQ, rcu_process_callbacks);

}



/*