]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
sparc: Merge asm-sparc{,64}/setup.h
authorSam Ravnborg <sam@ravnborg.org>
Fri, 6 Jun 2008 19:06:11 +0000 (21:06 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 Jul 2008 04:42:09 +0000 (21:42 -0700)
COMMAND_LINE_SIZE differ for 32 and 64 bit.
256 versus 2048

:$ diff -u include/asm-sparc/setup.h include/asm-sparc64/setup.h
:-- include/asm-sparc/setup.h 2008-06-13 06:42:07.000000000 +0200
:++ include/asm-sparc64/setup.h 2008-06-13 06:42:07.000000000 +0200
:@@ -2,9 +2,9 @@
:  * Just a place holder.
:  */
:
:-#ifndef _SPARC_SETUP_H
:-#define _SPARC_SETUP_H
:+#ifndef _SPARC64_SETUP_H
:+#define _SPARC64_SETUP_H
:
:-#define COMMAND_LINE_SIZE 256
:+#define COMMAND_LINE_SIZE 2048
:
:-#endif /* _SPARC_SETUP_H */
:+#endif /* _SPARC64_SETUP_H */

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
include/asm-sparc/setup.h
include/asm-sparc64/setup.h

index b3af958a2ad2d2fbce85d20368f6553592370063..2643c62f4ac0d6809797e2b851e98fe8ce5e8042 100644 (file)
@@ -5,6 +5,10 @@
 #ifndef _SPARC_SETUP_H
 #define _SPARC_SETUP_H
 
-#define COMMAND_LINE_SIZE      256
+#if defined(__sparc__) && defined(__arch64__)
+# define COMMAND_LINE_SIZE 2048
+#else
+# define COMMAND_LINE_SIZE 256
+#endif
 
 #endif /* _SPARC_SETUP_H */
index 5053df3cec400182b322ac805f0527aa53529742..7143d06b2c55f0e3473f9a50eff7c17944c3db97 100644 (file)
@@ -1,10 +1 @@
-/*
- *     Just a place holder. 
- */
-
-#ifndef _SPARC64_SETUP_H
-#define _SPARC64_SETUP_H
-
-#define COMMAND_LINE_SIZE      2048
-
-#endif /* _SPARC64_SETUP_H */
+#include <asm-sparc/setup.h>