Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=145dea009828df7b091e7f7f24497ceb12dbbb3d
Commit:     145dea009828df7b091e7f7f24497ceb12dbbb3d
Parent:     e10195c232d426b5e960038e10b0df8f75d86309
Author:     David S. Miller <[EMAIL PROTECTED]>
AuthorDate: Fri Nov 16 02:57:01 2007 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Sat Feb 9 04:00:37 2008 -0800

    [SPARC]: Merge asm-sparc{,64}/bugs.h
    
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 include/asm-sparc/bugs.h   |   40 ++++++++++++++++++++++++----------------
 include/asm-sparc64/bugs.h |   11 +----------
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/include/asm-sparc/bugs.h b/include/asm-sparc/bugs.h
dissimilarity index 64%
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.
- *
- *  Copyright (C) 1996 David S. Miller ([EMAIL PROTECTED])
- */
-
-#include <asm/cpudata.h>
-
-extern unsigned long loops_per_jiffy;
-
-static void check_bugs(void)
-{
-#ifndef CONFIG_SMP
-       cpu_data(0).udelay_val = loops_per_jiffy;
-#endif
-}
+/* include/asm-sparc/bugs.h:  Sparc probes for various bugs.
+ *
+ * Copyright (C) 1996, 2007 David S. Miller ([EMAIL PROTECTED])
+ */
+
+#ifdef CONFIG_SPARC32
+#include <asm/cpudata.h>
+#endif
+
+#ifdef CONFIG_SPARC64
+#include <asm/sstate.h>
+#endif
+
+extern unsigned long loops_per_jiffy;
+
+static void __init check_bugs(void)
+{
+#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 ([EMAIL PROTECTED])
- */
-#include <asm/sstate.h>
-
-static void __init check_bugs(void)
-{
-       sstate_running();
-}
+#include <asm-sparc/bugs.h>
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to