Commit dc9a082e authored by Anton Blanchard's avatar Anton Blanchard

ppc64: misc cleanups

parent e26f8684
/* /*
*
*
* arch/ppc/kernel/irq.c * arch/ppc/kernel/irq.c
* *
* Derived from arch/i386/kernel/irq.c * Derived from arch/i386/kernel/irq.c
...@@ -25,7 +23,6 @@ ...@@ -25,7 +23,6 @@
* should be easier. * should be easier.
*/ */
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/threads.h> #include <linux/threads.h>
......
...@@ -182,9 +182,9 @@ static __inline__ void timer_sync_xtime( unsigned long cur_tb ) ...@@ -182,9 +182,9 @@ static __inline__ void timer_sync_xtime( unsigned long cur_tb )
#ifdef CONFIG_PPC_ISERIES #ifdef CONFIG_PPC_ISERIES
/* /*
* This function recalibrates the timebase based on the 49-bit time-of-day value in the Titan chip. * This function recalibrates the timebase based on the 49-bit time-of-day
* The Titan is much more accurate than the value returned by the service processor for the * value in the Titan chip. The Titan is much more accurate than the value
* timebase frequency. * returned by the service processor for the timebase frequency.
*/ */
static void iSeries_tb_recal(void) static void iSeries_tb_recal(void)
...@@ -484,10 +484,10 @@ void __init time_init(void) ...@@ -484,10 +484,10 @@ void __init time_init(void)
* After adjtimex is called, adjust the conversion of tb ticks * After adjtimex is called, adjust the conversion of tb ticks
* to microseconds to keep do_gettimeofday synchronized * to microseconds to keep do_gettimeofday synchronized
* with ntpd. * with ntpd.
*
* Use the time_adjust, time_freq and time_offset computed by adjtimex to * Use the time_adjust, time_freq and time_offset computed by adjtimex to
* adjust the frequency. * adjust the frequency.
*/ */
/* #define DEBUG_PPC_ADJTIMEX 1 */ /* #define DEBUG_PPC_ADJTIMEX 1 */
...@@ -530,8 +530,11 @@ void ppc_adjtimex(void) ...@@ -530,8 +530,11 @@ void ppc_adjtimex(void)
/* Compute parts per million frequency adjustment to match time_adjust */ /* Compute parts per million frequency adjustment to match time_adjust */
singleshot_ppm = tickadj * HZ; singleshot_ppm = tickadj * HZ;
/* The adjustment should be tickadj*HZ to match the code in linux/kernel/timer.c, but /*
experiments show that this is too large. 3/4 of tickadj*HZ seems about right */ * The adjustment should be tickadj*HZ to match the code in
* linux/kernel/timer.c, but experiments show that this is too
* large. 3/4 of tickadj*HZ seems about right
*/
singleshot_ppm -= singleshot_ppm / 4; singleshot_ppm -= singleshot_ppm / 4;
/* Use SHIFT_USEC to get it into the same units as time_freq */ /* Use SHIFT_USEC to get it into the same units as time_freq */
singleshot_ppm <<= SHIFT_USEC; singleshot_ppm <<= SHIFT_USEC;
......
...@@ -185,13 +185,6 @@ extern inline void sync(void) ...@@ -185,13 +185,6 @@ extern inline void sync(void)
asm volatile("sync; isync"); asm volatile("sync; isync");
} }
extern inline void __delay(unsigned int loops)
{
if (loops != 0)
__asm__ __volatile__("mtctr %0; 1: bdnz 1b" : :
"r" (loops) : "ctr");
}
/* (Ref: 64-bit PowerPC ELF ABI Spplement; Ian Lance Taylor, Zembu Labs). /* (Ref: 64-bit PowerPC ELF ABI Spplement; Ian Lance Taylor, Zembu Labs).
A PPC stack frame looks like this: A PPC stack frame looks like this:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment