diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-12 20:55:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-12 20:55:31 -0800 |
| commit | f25bb39f8adfe980df223f415f3b845953ca1147 (patch) | |
| tree | 720e9a95d36061d133867d07282654dc9825b570 /arch/mips/powertv/memory.c | |
| parent | 7113578a8a930259d6497976208e5b3e57141c5c (diff) | |
| parent | 9a3065c942d59afcc1b71bb75743d9f37fcc2954 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (22 commits)
MIPS: Ignore vmlinux.*
MIPS: Move vmlinux.ecoff to arch/mips/boot
MIPS: cpumask_of_node() should handle -1 as a node
MIPS: Octeon: Use non-overflowing arithmetic in sched_clock
MIPS: Malta, PowerTV: Remove unnecessary "Linux started"
MIPS: BCM63xx: Remove duplicate CONFIG_CMDLINE.
MIPS: AR7: Remove unused prom_getchar()
MIPS: PowerTV: Remove extra r4k_clockevent_init() call
MIPS: Cobalt use strlcat() for the command line arguments
MIPS: Octeon: Add sched_clock() to csrc-octeon.c
MIPS: TXx9: Cleanup builtin-cmdline processing
MIPS: PowerTV: simplify prom_init_cmdline() and merge into prom_init()
MIPS: PowerTV: Remove unused platform_die()
MIPS: PowerTV: Remove mips_machine_halt()
MIPS: PowerTV: Remove unused ptv_memsize
MIPS: PowerTV: Remove unused prom_getcmdline()
MIPS: AR7: Remove kgdb_enabled
MIPS: Alchemy: Correct code taking the size of a pointer
MIPS: BCM63xx: Fix whitespace damaged board_bcm963xx.c
MIPS: VR41xx: Use strlcat() for the command line arguments
...
Diffstat (limited to 'arch/mips/powertv/memory.c')
| -rw-r--r-- | arch/mips/powertv/memory.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/mips/powertv/memory.c b/arch/mips/powertv/memory.c index 28d06605fff..f49eb3d0358 100644 --- a/arch/mips/powertv/memory.c +++ b/arch/mips/powertv/memory.c @@ -42,8 +42,6 @@ #define BOOT_MEM_SIZE KIBIBYTE(256) /* Memory reserved for bldr */ #define PHYS_MEM_START 0x10000000 /* Start of physical memory */ -unsigned long ptv_memsize; - char __initdata cmdline[COMMAND_LINE_SIZE]; void __init prom_meminit(void) @@ -87,9 +85,6 @@ void __init prom_meminit(void) } } - /* Store memsize for diagnostic purposes */ - ptv_memsize = memsize; - physend = PFN_ALIGN(&_end) - 0x80000000; if (memsize > LOW_MEM_MAX) { low_mem = LOW_MEM_MAX; |