Messages in this thread Patch in this message | | | Date | Mon, 14 Jun 2004 08:13:48 -0500 (CDT) | From | Jake Moilanen <> | Subject | Re: [PATCH][RFC] Spinlock-timeout |
| |
> > > Here's the ppc64 add-on for using timebase register for the spinlock > > timeout. If no one has any issues w/ the base spin-lock timeout patch, or > > this one, please apply. > > Same comment, make sure you produce a unified diff.
Here's the unified ver.
diff -Nru a/arch/ppc64/kernel/chrp_setup.c b/arch/ppc64/kernel/chrp_setup.c --- a/arch/ppc64/kernel/chrp_setup.c Mon Jun 14 08:07:11 2004 +++ b/arch/ppc64/kernel/chrp_setup.c Mon Jun 14 08:07:11 2004 @@ -405,10 +405,6 @@
extern void setup_default_decr(void);
-/* Some sane defaults: 125 MHz timebase, 1GHz processor */ -#define DEFAULT_TB_FREQ 125000000UL -#define DEFAULT_PROC_FREQ (DEFAULT_TB_FREQ * 8) - void __init pSeries_calibrate_decr(void) { struct device_node *cpu; diff -Nru a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c --- a/arch/ppc64/kernel/time.c Mon Jun 14 08:07:11 2004 +++ b/arch/ppc64/kernel/time.c Mon Jun 14 08:07:11 2004 @@ -81,7 +81,7 @@
#define XSEC_PER_SEC (1024*1024)
-unsigned long tb_ticks_per_jiffy; +unsigned long tb_ticks_per_jiffy = DEFAULT_TB_FREQ / HZ; unsigned long tb_ticks_per_usec; unsigned long tb_ticks_per_sec; unsigned long next_xtime_sync_tb; diff -Nru a/include/asm-ppc64/processor.h b/include/asm-ppc64/processor.h --- a/include/asm-ppc64/processor.h Mon Jun 14 08:07:11 2004 +++ b/include/asm-ppc64/processor.h Mon Jun 14 08:07:11 2004 @@ -440,6 +440,9 @@
#endif /* __ASSEMBLY__ */
+/* Some sane defaults: 125 MHz timebase, 1GHz processor */ +#define DEFAULT_TB_FREQ 125000000UL +#define DEFAULT_PROC_FREQ (DEFAULT_TB_FREQ * 8)
/* Macros for setting and retrieving special purpose registers */
diff -Nru a/include/asm-ppc64/spinlock.h b/include/asm-ppc64/spinlock.h --- a/include/asm-ppc64/spinlock.h Mon Jun 14 08:07:11 2004 +++ b/include/asm-ppc64/spinlock.h Mon Jun 14 08:07:11 2004 @@ -278,5 +278,16 @@ } #endif /* CONFIG_SPINLINE */
+#ifdef CONFIG_SPINLOCK_TIMEOUT + +#define ARCH_HAS_SPINLOCK_TIMEOUT + +extern unsigned long tb_ticks_per_jiffy; + +#define get_spinlock_timeout() (mftb() + (tb_ticks_per_jiffy * SPINLOCK_TIMEOUT * HZ)) +#define check_spinlock_timeout(timeout) (mftb() >= timeout ? 1 : 0) + +#endif /* CONFIG_SPINLOCK_TIMEOUT */ + #endif /* __KERNEL__ */ #endif /* __ASM_SPINLOCK_H */ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |