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
Pull cpuidle into release branch
[pandora-kernel.git]
/
arch
/
avr32
/
mm
/
init.c
diff --git
a/arch/avr32/mm/init.c
b/arch/avr32/mm/init.c
index
82cf708
..
480760b
100644
(file)
--- a/
arch/avr32/mm/init.c
+++ b/
arch/avr32/mm/init.c
@@
-224,19
+224,9
@@
void free_initmem(void)
#ifdef CONFIG_BLK_DEV_INITRD
#ifdef CONFIG_BLK_DEV_INITRD
-static int keep_initrd;
-
void free_initrd_mem(unsigned long start, unsigned long end)
{
void free_initrd_mem(unsigned long start, unsigned long end)
{
- if (!keep_initrd)
- free_area(start, end, "initrd");
-}
-
-static int __init keepinitrd_setup(char *__unused)
-{
- keep_initrd = 1;
- return 1;
+ free_area(start, end, "initrd");
}
}
-__setup("keepinitrd", keepinitrd_setup);
#endif
#endif