diff --git a/[refs] b/[refs] index ab071aba96b7..c74ec35474b1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1cea3bab575af386618baba0db3c5fae7ce521f +refs/heads/master: abe5b417fb4a52e9510fdb5a16e722e91bf89e92 diff --git a/trunk/arch/mips/lib/delay.c b/trunk/arch/mips/lib/delay.c index 6b3b1de9dcae..5995969e8c42 100644 --- a/trunk/arch/mips/lib/delay.c +++ b/trunk/arch/mips/lib/delay.c @@ -41,7 +41,7 @@ EXPORT_SYMBOL(__delay); void __udelay(unsigned long us) { - unsigned int lpj = current_cpu_data.udelay_val; + unsigned int lpj = raw_current_cpu_data.udelay_val; __delay((us * 0x000010c7ull * HZ * lpj) >> 32); } @@ -49,7 +49,7 @@ EXPORT_SYMBOL(__udelay); void __ndelay(unsigned long ns) { - unsigned int lpj = current_cpu_data.udelay_val; + unsigned int lpj = raw_current_cpu_data.udelay_val; __delay((ns * 0x00000005ull * HZ * lpj) >> 32); }