git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'audit.b54' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...
[pandora-kernel.git]
/
arch
/
mips
/
au1000
/
pb1000
/
init.c
diff --git
a/arch/mips/au1000/pb1000/init.c
b/arch/mips/au1000/pb1000/init.c
index
2515b9f
..
8a9c7d5
100644
(file)
--- a/
arch/mips/au1000/pb1000/init.c
+++ b/
arch/mips/au1000/pb1000/init.c
@@
-1,10
+1,9
@@
/*
* BRIEF MODULE DESCRIPTION
/*
* BRIEF MODULE DESCRIPTION
- * P
B
1000 board setup
+ * P
b
1000 board setup
*
*
- * Copyright 2001 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
- * ppopov@mvista.com or source@mvista.com
+ * Copyright 2001, 2008 MontaVista Software Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@
-26,14
+25,10
@@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <linux/init.h>
#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
-#include <linux/bootmem.h>
-#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/kernel.h>
-#include <asm/addrspace.h>
#include <asm/bootinfo.h>
#include <prom.h>
#include <asm/bootinfo.h>
#include <prom.h>
@@
-48,16
+43,15
@@
void __init prom_init(void)
unsigned char *memsize_str;
unsigned long memsize;
unsigned char *memsize_str;
unsigned long memsize;
- prom_argc = (int)
fw_arg0;
- prom_argv = (char **)
fw_arg1;
- prom_envp = (char **)
fw_arg2;
+ prom_argc = (int)fw_arg0;
+ prom_argv = (char **)fw_arg1;
+ prom_envp = (char **)fw_arg2;
prom_init_cmdline();
memsize_str = prom_getenv("memsize");
prom_init_cmdline();
memsize_str = prom_getenv("memsize");
- if (!memsize_str)
{
+ if (!memsize_str)
memsize = 0x04000000;
memsize = 0x04000000;
- } else {
- memsize = simple_strtol(memsize_str, NULL, 0);
- }
+ else
+ strict_strtol(memsize_str, 0, &memsize);
add_memory_region(0, memsize, BOOT_MEM_RAM);
}
add_memory_region(0, memsize, BOOT_MEM_RAM);
}