Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[SPARC]: Merge asm-sparc{,64}/bugs.h
Signed-off-by: David S. Miller <davem@davemloft.net>
authored by David S. Miller and committed by David S. Miller 145dea00 e10195c2
+13
-5
include/asm-sparc/bugs.h
+13
-5
include/asm-sparc/bugs.h
···
1
-
/* $Id: bugs.h,v 1.1 1996/12/26 13:25:20 davem Exp $
2
-
* include/asm-sparc/bugs.h: Sparc probes for various bugs.
3
*
4
-
* Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
5
*/
6
7
#include <asm/cpudata.h>
8
9
extern unsigned long loops_per_jiffy;
10
11
-
static void check_bugs(void)
12
{
13
-
#ifndef CONFIG_SMP
14
cpu_data(0).udelay_val = loops_per_jiffy;
15
#endif
16
}
···
1
+
/* include/asm-sparc/bugs.h: Sparc probes for various bugs.
2
*
3
+
* Copyright (C) 1996, 2007 David S. Miller (davem@davemloft.net)
4
*/
5
6
+
#ifdef CONFIG_SPARC32
7
#include <asm/cpudata.h>
8
+
#endif
9
+
10
+
#ifdef CONFIG_SPARC64
11
+
#include <asm/sstate.h>
12
+
#endif
13
14
extern unsigned long loops_per_jiffy;
15
16
+
static void __init check_bugs(void)
17
{
18
+
#if defined(CONFIG_SPARC32) && !defined(CONFIG_SMP)
19
cpu_data(0).udelay_val = loops_per_jiffy;
20
+
#endif
21
+
#ifdef CONFIG_SPARC64
22
+
sstate_running();
23
#endif
24
}
+1
-10
include/asm-sparc64/bugs.h
+1
-10
include/asm-sparc64/bugs.h