diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-14 13:03:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-14 13:03:24 -0800 |
| commit | 24dfb2b5867df24ba03b6c4418312e23b1300aa8 (patch) | |
| tree | c6381a80ee04eb253121ccfd49d05af7559c0041 /arch/mips/mti-malta/malta-memory.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input (diff) | |
| parent | MIPS: SMTC: Fix lockup in smtc_distribute_timer (diff) | |
| download | linux-dev-24dfb2b5867df24ba03b6c4418312e23b1300aa8.tar.xz linux-dev-24dfb2b5867df24ba03b6c4418312e23b1300aa8.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: SMTC: Fix lockup in smtc_distribute_timer
MIPS: TXx9: Update rbtx49xx_defconfig
MIPS: Make local arrays with CL_SIZE static __initdata
MIPS: Add DMA declare coherent memory support
MIPS: Fix emulation of 64-bit FPU on FPU-less 64-bit CPUs.
Diffstat (limited to 'arch/mips/mti-malta/malta-memory.c')
| -rw-r--r-- | arch/mips/mti-malta/malta-memory.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/mti-malta/malta-memory.c b/arch/mips/mti-malta/malta-memory.c index 61888ff72c87..9035c64bc5ed 100644 --- a/arch/mips/mti-malta/malta-memory.c +++ b/arch/mips/mti-malta/malta-memory.c @@ -54,7 +54,8 @@ static struct prom_pmemblock * __init prom_getmdesc(void) { char *memsize_str; unsigned int memsize; - char cmdline[CL_SIZE], *ptr; + char *ptr; + static char cmdline[CL_SIZE] __initdata; /* otherwise look in the environment */ memsize_str = prom_getenv("memsize"); |