From 145dea009828df7b091e7f7f24497ceb12dbbb3d Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Fri, 16 Nov 2007 02:57:01 -0800 Subject: [PATCH] [SPARC]: Merge asm-sparc{,64}/bugs.h Signed-off-by: David S. Miller --- include/asm-sparc/bugs.h | 18 +++++++++++++----- 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 a0f939b..2dfc07b 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 +#endif + +#ifdef CONFIG_SPARC64 +#include +#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 11ade68..04ae9e2 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 - -static void __init check_bugs(void) -{ - sstate_running(); -} +#include -- 2.7.4