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

Commit ff86303e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched 

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
  [PATCH] sched: implement cpu_clock(cpu) high-speed time source
  [PATCH] sched: fix the all pinned logic in load_balance_newidle()
  [PATCH] sched: fix newly idle load balance in case of SMT
  [PATCH] sched: sched_cacheflush is now unused
parents 626ac545 e436d800

arch/ia64/kernel/setup.c

+0 −9
Original line number Diff line number Diff line
@@ -980,15 +980,6 @@ cpu_init (void) 
	pm_idle = default_idle;

}



/*

 * On SMP systems, when the scheduler does migration-cost autodetection,

 * it needs a way to flush as much of the CPU's caches as possible.

 */

void sched_cacheflush(void)

{

	ia64_sal_cache_flush(3);

}



void __init

check_bugs (void)

{

include/asm-alpha/system.h

+0 −10
Original line number Diff line number Diff line
@@ -139,16 +139,6 @@ extern void halt(void) __attribute__((noreturn)); 
struct task_struct;

extern struct task_struct *alpha_switch_to(unsigned long, struct task_struct*);



/*

 * On SMP systems, when the scheduler does migration-cost autodetection,

 * it needs a way to flush as much of the CPU's caches as possible.

 *

 * TODO: fill this in!

 */

static inline void sched_cacheflush(void)

{

}



#define imb() \

__asm__ __volatile__ ("call_pal %0 #imb" : : "i" (PAL_imb) : "memory")

include/asm-arm/system.h

+0 −10
Original line number Diff line number Diff line
@@ -254,16 +254,6 @@ do { \ 
	last = __switch_to(prev,task_thread_info(prev), task_thread_info(next));	\

} while (0)



/*

 * On SMP systems, when the scheduler does migration-cost autodetection,

 * it needs a way to flush as much of the CPU's caches as possible.

 *

 * TODO: fill this in!

 */

static inline void sched_cacheflush(void)

{

}



#if defined(CONFIG_CPU_SA1100) || defined(CONFIG_CPU_SA110)

/*

 * On the StrongARM, "swp" is terminally broken since it bypasses the

include/asm-arm26/system.h

+0 −10
Original line number Diff line number Diff line
@@ -109,16 +109,6 @@ do { \ 
	last = __switch_to(prev,task_thread_info(prev),task_thread_info(next));	\

} while (0)



/*

 * On SMP systems, when the scheduler does migration-cost autodetection,

 * it needs a way to flush as much of the CPU's caches as possible.

 *

 * TODO: fill this in!

 */

static inline void sched_cacheflush(void)

{

}



/*

 * Save the current interrupt enable state & disable IRQs

 */

include/asm-i386/system.h

+0 −9
Original line number Diff line number Diff line
@@ -310,15 +310,6 @@ void enable_hlt(void); 
extern int es7000_plat;

void cpu_idle_wait(void);



/*

 * On SMP systems, when the scheduler does migration-cost autodetection,

 * it needs a way to flush as much of the CPU's caches as possible:

 */

static inline void sched_cacheflush(void)

{

	wbinvd();

}



extern unsigned long arch_align_stack(unsigned long sp);

extern void free_init_pages(char *what, unsigned long begin, unsigned long end);