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

Commit 7f9dce38 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'sched/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: hrtick_enabled() should use cpu_active()
  sched, x86: clean up hrtick implementation
  sched: fix build error, provide partition_sched_domains() unconditionally
  sched: fix warning in inc_rt_tasks() to not declare variable 'rq' if it's not needed
  cpu hotplug: Make cpu_active_map synchronization dependency clear
  cpu hotplug, sched: Introduce cpu_active_map and redo sched domain managment (take 2)
  sched: rework of "prioritize non-migratable tasks over migratable ones"
  sched: reduce stack size in isolated_cpu_setup()
  Revert parts of "ftrace: do not trace scheduler functions"

Fixed up conflicts in include/asm-x86/thread_info.h (due to the
TIF_SINGLESTEP unification vs TIF_HRTICK_RESCHED removal) and
kernel/sched_fair.c (due to cpu_active_map vs for_each_cpu_mask_nr()
introduction).
parents 26dcce0f ba42059f

arch/x86/kernel/signal_32.c

+0 −3
Original line number Diff line number Diff line
@@ -661,8 +661,5 @@ do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags) 
	if (thread_info_flags & _TIF_SIGPENDING)

		do_signal(regs);



	if (thread_info_flags & _TIF_HRTICK_RESCHED)

		hrtick_resched();



	clear_thread_flag(TIF_IRET);

}

arch/x86/kernel/signal_64.c

+0 −3
Original line number Diff line number Diff line
@@ -496,9 +496,6 @@ void do_notify_resume(struct pt_regs *regs, void *unused, 
	/* deal with pending signal delivery */

	if (thread_info_flags & _TIF_SIGPENDING)

		do_signal(regs);



	if (thread_info_flags & _TIF_HRTICK_RESCHED)

		hrtick_resched();

}



void signal_fault(struct pt_regs *regs, void __user *frame, char *where)

include/asm-x86/thread_info.h

+1 −3
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ struct thread_info { 
#define TIF_SYSCALL_AUDIT	7	/* syscall auditing active */

#define TIF_SECCOMP		8	/* secure computing */

#define TIF_MCE_NOTIFY		10	/* notify userspace of an MCE */

#define TIF_HRTICK_RESCHED	11	/* reprogram hrtick timer */

#define TIF_NOTSC		16	/* TSC is not accessible in userland */

#define TIF_IA32		17	/* 32bit process */

#define TIF_FORK		18	/* ret_from_fork */
@@ -102,7 +101,6 @@ struct thread_info { 
#define _TIF_SYSCALL_AUDIT	(1 << TIF_SYSCALL_AUDIT)

#define _TIF_SECCOMP		(1 << TIF_SECCOMP)

#define _TIF_MCE_NOTIFY		(1 << TIF_MCE_NOTIFY)

#define _TIF_HRTICK_RESCHED	(1 << TIF_HRTICK_RESCHED)

#define _TIF_NOTSC		(1 << TIF_NOTSC)

#define _TIF_IA32		(1 << TIF_IA32)

#define _TIF_FORK		(1 << TIF_FORK)
@@ -135,7 +133,7 @@ struct thread_info { 


/* Only used for 64 bit */

#define _TIF_DO_NOTIFY_MASK						\

	(_TIF_SIGPENDING|_TIF_MCE_NOTIFY|_TIF_HRTICK_RESCHED)

	(_TIF_SIGPENDING|_TIF_MCE_NOTIFY)



/* flags to check in __switch_to() */

#define _TIF_WORK_CTXSW							\

include/linux/cpumask.h

+5 −1
Original line number Diff line number Diff line
@@ -458,13 +458,14 @@ int __next_cpu_nr(int n, const cpumask_t *srcp); 


/*

 * The following particular system cpumasks and operations manage

 * possible, present and online cpus.  Each of them is a fixed size

 * possible, present, active and online cpus.  Each of them is a fixed size

 * bitmap of size NR_CPUS.

 *

 *  #ifdef CONFIG_HOTPLUG_CPU

 *     cpu_possible_map - has bit 'cpu' set iff cpu is populatable

 *     cpu_present_map  - has bit 'cpu' set iff cpu is populated

 *     cpu_online_map   - has bit 'cpu' set iff cpu available to scheduler

 *     cpu_active_map   - has bit 'cpu' set iff cpu available to migration

 *  #else

 *     cpu_possible_map - has bit 'cpu' set iff cpu is populated

 *     cpu_present_map  - copy of cpu_possible_map
@@ -515,6 +516,7 @@ int __next_cpu_nr(int n, const cpumask_t *srcp); 
extern cpumask_t cpu_possible_map;

extern cpumask_t cpu_online_map;

extern cpumask_t cpu_present_map;

extern cpumask_t cpu_active_map;



#if NR_CPUS > 1

#define num_online_cpus()	cpus_weight_nr(cpu_online_map)
@@ -523,6 +525,7 @@ extern cpumask_t cpu_present_map; 
#define cpu_online(cpu)		cpu_isset((cpu), cpu_online_map)

#define cpu_possible(cpu)	cpu_isset((cpu), cpu_possible_map)

#define cpu_present(cpu)	cpu_isset((cpu), cpu_present_map)

#define cpu_active(cpu)		cpu_isset((cpu), cpu_active_map)

#else

#define num_online_cpus()	1

#define num_possible_cpus()	1
@@ -530,6 +533,7 @@ extern cpumask_t cpu_present_map; 
#define cpu_online(cpu)		((cpu) == 0)

#define cpu_possible(cpu)	((cpu) == 0)

#define cpu_present(cpu)	((cpu) == 0)

#define cpu_active(cpu)		((cpu) == 0)

#endif



#define cpu_is_offline(cpu)	unlikely(!cpu_online(cpu))

include/linux/cpuset.h

+7 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ extern void cpuset_track_online_nodes(void); 


extern int current_cpuset_is_being_rebound(void);



extern void rebuild_sched_domains(void);



#else /* !CONFIG_CPUSETS */



static inline int cpuset_init_early(void) { return 0; }
@@ -156,6 +158,11 @@ static inline int current_cpuset_is_being_rebound(void) 
	return 0;

}



static inline void rebuild_sched_domains(void)

{

	partition_sched_domains(0, NULL, NULL);

}



#endif /* !CONFIG_CPUSETS */



#endif /* _LINUX_CPUSET_H */