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

Commit 19035e5b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-for-linus-migration' of... 

Merge branch 'timers-for-linus-migration' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-for-linus-migration' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  timers: Logic to move non pinned timers
  timers: /proc/sys sysctl hook to enable timer migration
  timers: Identifying the existing pinned timers
  timers: Framework for identifying pinned timers
  timers: allow deferrable timers for intervals tv2-tv5 to be deferred

Fix up conflicts in kernel/sched.c and kernel/timer.c manually
parents f9db6e09 eea08f32

arch/x86/kernel/apic/x2apic_uv_x.c

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ static void uv_heartbeat(unsigned long ignored) 
	uv_set_scir_bits(bits);



	/* enable next timer period */

	mod_timer(timer, jiffies + SCIR_CPU_HB_INTERVAL);

	mod_timer_pinned(timer, jiffies + SCIR_CPU_HB_INTERVAL);

}



static void __cpuinit uv_heartbeat_enable(int cpu)

include/linux/clockchips.h

+9 −0
Original line number Diff line number Diff line
@@ -143,3 +143,12 @@ extern void clockevents_notify(unsigned long reason, void *arg); 
#endif



#endif



#ifdef CONFIG_GENERIC_CLOCKEVENTS

extern ktime_t clockevents_get_next_event(int cpu);

#else

static inline ktime_t clockevents_get_next_event(int cpu)

{

	return (ktime_t) { .tv64 = KTIME_MAX };

}

#endif

include/linux/hrtimer.h

+5 −2
Original line number Diff line number Diff line
@@ -30,8 +30,11 @@ struct hrtimer_cpu_base; 
 * Mode arguments of xxx_hrtimer functions:

 */

enum hrtimer_mode {

	HRTIMER_MODE_ABS,	/* Time value is absolute */

	HRTIMER_MODE_REL,	/* Time value is relative to now */

	HRTIMER_MODE_ABS = 0x0,		/* Time value is absolute */

	HRTIMER_MODE_REL = 0x1,		/* Time value is relative to now */

	HRTIMER_MODE_PINNED = 0x02,	/* Timer is bound to CPU */

	HRTIMER_MODE_ABS_PINNED = 0x02,

	HRTIMER_MODE_REL_PINNED = 0x03,

};



/*

include/linux/sched.h

+13 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ extern void task_rq_unlock_wait(struct task_struct *p); 
extern cpumask_var_t nohz_cpu_mask;

#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ)

extern int select_nohz_load_balancer(int cpu);

extern int get_nohz_load_balancer(void);

#else

static inline int select_nohz_load_balancer(int cpu)

{
@@ -1796,11 +1797,23 @@ extern unsigned int sysctl_sched_child_runs_first; 
extern unsigned int sysctl_sched_features;

extern unsigned int sysctl_sched_migration_cost;

extern unsigned int sysctl_sched_nr_migrate;

extern unsigned int sysctl_timer_migration;



int sched_nr_latency_handler(struct ctl_table *table, int write,

		struct file *file, void __user *buffer, size_t *length,

		loff_t *ppos);

#endif

#ifdef CONFIG_SCHED_DEBUG

static inline unsigned int get_sysctl_timer_migration(void)

{

	return sysctl_timer_migration;

}

#else

static inline unsigned int get_sysctl_timer_migration(void)

{

	return 1;

}

#endif

extern unsigned int sysctl_sched_rt_period;

extern int sysctl_sched_rt_runtime;

include/linux/timer.h

+3 −0
Original line number Diff line number Diff line
@@ -163,7 +163,10 @@ extern void add_timer_on(struct timer_list *timer, int cpu); 
extern int del_timer(struct timer_list * timer);

extern int mod_timer(struct timer_list *timer, unsigned long expires);

extern int mod_timer_pending(struct timer_list *timer, unsigned long expires);

extern int mod_timer_pinned(struct timer_list *timer, unsigned long expires);



#define TIMER_NOT_PINNED	0

#define TIMER_PINNED		1

/*

 * The jiffies value which is added to now, when there is no timer

 * in the timer wheel: