diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-11-16 11:57:01 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-09 13:00:37 +0100 |
| commit | 145dea009828df7b091e7f7f24497ceb12dbbb3d (patch) | |
| tree | cde736e8a612855756983610496ef68e1761fd42 /include | |
| parent | [SPARC]: Merge asm-sparc{,64}/bug.h (diff) | |
| download | linux-145dea009828df7b091e7f7f24497ceb12dbbb3d.tar.xz linux-145dea009828df7b091e7f7f24497ceb12dbbb3d.zip | |
[SPARC]: Merge asm-sparc{,64}/bugs.h
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc/bugs.h | 18 | ||||
| -rw-r--r-- | include/asm-sparc64/bugs.h | 11 |
2 files changed, 14 insertions, 15 deletions
diff --git a/include/asm-sparc/bugs.h b/include/asm-sparc/bugs.h index a0f939beeea1..2dfc07bc8e54 100644 --- a/include/asm-sparc/bugs.h +++ b/include/asm-sparc/bugs.h @@ -1,16 +1,24 @@ -/* $Id: bugs.h,v 1.1 1996/12/26 13:25:20 davem Exp $ - * include/asm-sparc/bugs.h: Sparc probes for various bugs. +/* include/asm-sparc/bugs.h: Sparc probes for various bugs. * - * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) + * Copyright (C) 1996, 2007 David S. Miller (davem@davemloft.net) */ +#ifdef CONFIG_SPARC32 #include <asm/cpudata.h> +#endif + +#ifdef CONFIG_SPARC64 +#include <asm/sstate.h> +#endif extern unsigned long loops_per_jiffy; -static void check_bugs(void) +static void __init check_bugs(void) { -#ifndef CONFIG_SMP +#if defined(CONFIG_SPARC32) && !defined(CONFIG_SMP) cpu_data(0).udelay_val = loops_per_jiffy; #endif +#ifdef CONFIG_SPARC64 + sstate_running(); +#endif } diff --git a/include/asm-sparc64/bugs.h b/include/asm-sparc64/bugs.h index 11ade6841971..04ae9e2818cf 100644 --- a/include/asm-sparc64/bugs.h +++ b/include/asm-sparc64/bugs.h @@ -1,10 +1 @@ -/* bugs.h: Sparc64 probes for various bugs. - * - * Copyright (C) 1996, 2007 David S. Miller (davem@davemloft.net) - */ -#include <asm/sstate.h> - -static void __init check_bugs(void) -{ - sstate_running(); -} +#include <asm-sparc/bugs.h> |