From 16865807efe64f5b2cd78deef034827067b90db2 Mon Sep 17 00:00:00 2001 From: Graf Yang Date: Mon, 14 Sep 2009 04:41:00 +0000 Subject: [PATCH] --- yaml --- r: 162739 b: refs/heads/master c: e78feaaeeb9bbf78f961917d72d692802ac110e8 h: refs/heads/master i: 162737: a62adb669f608f2a73b2ec783825e87b60dad008 162735: 647766dd2f48c501fc2f9362d200a6ebeb584ba5 v: v3 --- [refs] | 2 +- trunk/arch/blackfin/Kconfig | 2 +- trunk/arch/blackfin/kernel/time-ts.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cb7d2ca5f0ce..393aa05a0114 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3289651a9767556822adbd492be957a1287ffd3f +refs/heads/master: e78feaaeeb9bbf78f961917d72d692802ac110e8 diff --git a/trunk/arch/blackfin/Kconfig b/trunk/arch/blackfin/Kconfig index e7a781d21486..9a01d445eca8 100644 --- a/trunk/arch/blackfin/Kconfig +++ b/trunk/arch/blackfin/Kconfig @@ -648,7 +648,7 @@ config CYCLES_CLOCKSOURCE writing the registers will most likely crash the kernel. config GPTMR0_CLOCKSOURCE - bool "Use GPTimer0 as a clocksource (higher rating)" + bool "Use GPTimer0 as a clocksource" select BFIN_GPTIMERS depends on GENERIC_CLOCKEVENTS depends on !TICKSOURCE_GPTMR0 diff --git a/trunk/arch/blackfin/kernel/time-ts.c b/trunk/arch/blackfin/kernel/time-ts.c index 0791eba40d9f..f9715764383e 100644 --- a/trunk/arch/blackfin/kernel/time-ts.c +++ b/trunk/arch/blackfin/kernel/time-ts.c @@ -66,7 +66,7 @@ static cycle_t bfin_read_cycles(struct clocksource *cs) static struct clocksource bfin_cs_cycles = { .name = "bfin_cs_cycles", - .rating = 350, + .rating = 400, .read = bfin_read_cycles, .mask = CLOCKSOURCE_MASK(64), .shift = 22, @@ -115,7 +115,7 @@ static cycle_t bfin_read_gptimer0(void) static struct clocksource bfin_cs_gptimer0 = { .name = "bfin_cs_gptimer0", - .rating = 400, + .rating = 350, .read = bfin_read_gptimer0, .mask = CLOCKSOURCE_MASK(32), .shift = 22,