forked from luck/tmp_suning_uos_patched
[SPARC]: Merge asm-sparc{,64}/bugs.h
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
e10195c232
commit
145dea0098
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue
Block a user