diff --git a/[refs] b/[refs] index b5470f9ab8de..9c9ed0c75bf4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bdd7c81b4973e72b670eff6b5725bab189b723d6 +refs/heads/master: d7876a08db50895ed9808ede4a259cccf65eba47 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 35ef06c99214..461ee900d1ac 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -96,10 +96,9 @@ unsigned long long __attribute__((weak)) sched_clock(void) #define MAX_USER_PRIO (USER_PRIO(MAX_PRIO)) /* - * Some helpers for converting nanosecond timing to jiffy resolution + * Helpers for converting nanosecond timing to jiffy resolution */ #define NS_TO_JIFFIES(TIME) ((unsigned long)(TIME) / (NSEC_PER_SEC / HZ)) -#define JIFFIES_TO_NS(TIME) ((TIME) * (NSEC_PER_SEC / HZ)) #define NICE_0_LOAD SCHED_LOAD_SCALE #define NICE_0_SHIFT SCHED_LOAD_SHIFT