UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix timekeeping on PowerPC 601
  [POWERPC] Don't expose clock vDSO functions when CPU has no timebase
  [POWERPC] spusched: Fix null pointer dereference in find_victim
This commit is contained in:
Linus Torvalds 2007-09-19 11:38:25 -07:00
parent dbe3ed1c07 c27da33969
commit f15f41383d
4 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/powerpc/kernel/time.c
View File

@ -239,7 +239,7 @@ static void snapshot_tb_and_purr(void *data)
struct cpu_purr_data *p = &__get_cpu_var(cpu_purr_data); struct cpu_purr_data *p = &__get_cpu_var(cpu_purr_data);
local_irq_save(flags); local_irq_save(flags);
p->tb = mftb(); p->tb = get_tb_or_rtc();
p->purr = mfspr(SPRN_PURR); p->purr = mfspr(SPRN_PURR);
wmb(); wmb();
p->initialized = 1; p->initialized = 1;
@ -317,7 +317,7 @@ static void snapshot_purr(void)
*/ */
void snapshot_timebase(void) void snapshot_timebase(void)
{ {
__get_cpu_var(last_jiffy) = get_tb(); __get_cpu_var(last_jiffy) = get_tb_or_rtc();
snapshot_purr(); snapshot_purr();
} }
@ -684,6 +684,8 @@ void timer_interrupt(struct pt_regs * regs)
write_seqlock(&xtime_lock); write_seqlock(&xtime_lock);
tb_next_jiffy = tb_last_jiffy + tb_ticks_per_jiffy; tb_next_jiffy = tb_last_jiffy + tb_ticks_per_jiffy;
if (__USE_RTC() && tb_next_jiffy >= 1000000000)
tb_next_jiffy -= 1000000000;
if (per_cpu(last_jiffy, cpu) >= tb_next_jiffy) { if (per_cpu(last_jiffy, cpu) >= tb_next_jiffy) {
tb_last_jiffy = tb_next_jiffy; tb_last_jiffy = tb_next_jiffy;
do_timer(1); do_timer(1);
@ -977,7 +979,7 @@ void __init time_init(void)
tb_to_ns_scale = scale; tb_to_ns_scale = scale;
tb_to_ns_shift = shift; tb_to_ns_shift = shift;
/* Save the current timebase to pretty up CONFIG_PRINTK_TIME */ /* Save the current timebase to pretty up CONFIG_PRINTK_TIME */
boot_tb = get_tb(); boot_tb = get_tb_or_rtc();
tm = get_boot_time(); tm = get_boot_time();

12
arch/powerpc/kernel/vdso.c
View File

@ -98,6 +98,18 @@ static struct vdso_patch_def vdso_patches[] = {
CPU_FTR_USE_TB, 0, CPU_FTR_USE_TB, 0,
"__kernel_gettimeofday", NULL "__kernel_gettimeofday", NULL
}, },
{
CPU_FTR_USE_TB, 0,
"__kernel_clock_gettime", NULL
},
{
CPU_FTR_USE_TB, 0,
"__kernel_clock_getres", NULL
},
{
CPU_FTR_USE_TB, 0,
"__kernel_get_tbfreq", NULL
},
}; };
/* /*

4
arch/powerpc/platforms/cell/spufs/sched.c
View File

@ -579,7 +579,7 @@ static struct spu *find_victim(struct spu_context *ctx)
list_for_each_entry(spu, &cbe_spu_info[node].spus, cbe_list) { list_for_each_entry(spu, &cbe_spu_info[node].spus, cbe_list) {
struct spu_context *tmp = spu->ctx; struct spu_context *tmp = spu->ctx;
if (tmp->prio > ctx->prio && if (tmp && tmp->prio > ctx->prio &&
(!victim || tmp->prio > victim->prio)) (!victim || tmp->prio > victim->prio))
victim = spu->ctx; victim = spu->ctx;
} }
@ -611,9 +611,9 @@ static struct spu *find_victim(struct spu_context *ctx)
mutex_lock(&cbe_spu_info[node].list_mutex); mutex_lock(&cbe_spu_info[node].list_mutex);
cbe_spu_info[node].nr_active--; cbe_spu_info[node].nr_active--;
spu_unbind_context(spu, victim);
mutex_unlock(&cbe_spu_info[node].list_mutex); mutex_unlock(&cbe_spu_info[node].list_mutex);
spu_unbind_context(spu, victim);
victim->stats.invol_ctx_switch++; victim->stats.invol_ctx_switch++;
spu->stats.invol_ctx_switch++; spu->stats.invol_ctx_switch++;
mutex_unlock(&victim->state_mutex); mutex_unlock(&victim->state_mutex);

5
include/asm-powerpc/time.h
View File

@ -149,6 +149,11 @@ static inline u64 get_tb(void)
} }
#endif /* !CONFIG_PPC64 */ #endif /* !CONFIG_PPC64 */
static inline u64 get_tb_or_rtc(void)
{
return __USE_RTC() ? get_rtc() : get_tb();
}
static inline void set_tb(unsigned int upper, unsigned int lower) static inline void set_tb(unsigned int upper, unsigned int lower)
{ {
mtspr(SPRN_TBWL, 0); mtspr(SPRN_TBWL, 0);