diff --git a/[refs] b/[refs] index b90d18b6b6f7..06044a2c338b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc203d2422004498909c4886d1b94a2e388d973e +refs/heads/master: e118adef232e637a8f091c1ded2fbf44fcf3ecc8 diff --git a/trunk/include/linux/jiffies.h b/trunk/include/linux/jiffies.h index 8b080024bbc1..7ba9e47bf061 100644 --- a/trunk/include/linux/jiffies.h +++ b/trunk/include/linux/jiffies.h @@ -29,6 +29,12 @@ # define SHIFT_HZ 9 #elif HZ >= 768 && HZ < 1536 # define SHIFT_HZ 10 +#elif HZ >= 1536 && HZ < 3072 +# define SHIFT_HZ 11 +#elif HZ >= 3072 && HZ < 6144 +# define SHIFT_HZ 12 +#elif HZ >= 6144 && HZ < 12288 +# define SHIFT_HZ 13 #else # error You lose. #endif