diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2008-06-06 21:06:11 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-17 21:42:09 -0700 |
| commit | 7c4285d8362641b815ea71018139619db965ab34 (patch) | |
| tree | 79180265b59e326d93ba49658839305060811a9c /include/asm-sparc/setup.h | |
| parent | 68a61c8d87dae7c7b7cc76ab01190475e87be0d9 (diff) | |
| download | kernel_samsung_smdk4412-7c4285d8362641b815ea71018139619db965ab34.tar.gz kernel_samsung_smdk4412-7c4285d8362641b815ea71018139619db965ab34.tar.bz2 kernel_samsung_smdk4412-7c4285d8362641b815ea71018139619db965ab34.zip | |
sparc: Merge asm-sparc{,64}/setup.h
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>
Diffstat (limited to 'include/asm-sparc/setup.h')
| -rw-r--r-- | include/asm-sparc/setup.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-sparc/setup.h b/include/asm-sparc/setup.h index b3af958a2ad..2643c62f4ac 100644 --- a/include/asm-sparc/setup.h +++ b/include/asm-sparc/setup.h @@ -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 */ |