* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: initramfs: Fix build break on symbol-prefixed archs initramfs: fix initramfs size calculation initramfs: generalize initramfs_data.xxx.S variants scripts/kallsyms: Enable error messages while hush up unnecessary warnings scripts/setlocalversion: update comment kbuild: Use a single clean rule for kernel and external modules kbuild: Do not run make clean in $(srctree) scripts/mod/modpost.c: fix commentary accordingly to last changes kbuild: Really don't clean bounds.h and asm-offsets.h
Showing the changes to init (1 of 16 files). Show all
Unified · Split
| @@ -483,7 +483,8 @@ static int __init retain_initrd_param(char *str) · 482 unmodified lines | |||
| 483 | } | 483 | } |
| 484 | __setup("retain_initrd", retain_initrd_param); | 484 | __setup("retain_initrd", retain_initrd_param); |
| 485 | 485 | ||
| 486 | extern char __initramfs_start[], __initramfs_end[]; | 486 | extern char __initramfs_start[]; |
| 487 | extern unsigned long __initramfs_size; | ||
| 487 | #include <linux/initrd.h> | 488 | #include <linux/initrd.h> |
| 488 | #include <linux/kexec.h> | 489 | #include <linux/kexec.h> |
| 489 | 490 | ||
| @@ -570,8 +571,7 @@ static void __init clean_rootfs(void) · 80 unmodified lines | |||
| 570 | 571 | ||
| 571 | static int __init populate_rootfs(void) | 572 | static int __init populate_rootfs(void) |
| 572 | { | 573 | { |
| 573 | char *err = unpack_to_rootfs(__initramfs_start, | 574 | char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size); |
| 574 | __initramfs_end - __initramfs_start); | ||
| 575 | if (err) | 575 | if (err) |
| 576 | panic(err); /* Failed to decompress INTERNAL initramfs */ | 576 | panic(err); /* Failed to decompress INTERNAL initramfs */ |
| 577 | if (initrd_start) { | 577 | if (initrd_start) { |
| @@ -585,8 +585,7 @@ static int __init populate_rootfs(void) · 7 unmodified lines | |||
| 585 | return 0; | 585 | return 0; |
| 586 | } else { | 586 | } else { |
| 587 | clean_rootfs(); | 587 | clean_rootfs(); |
| 588 | unpack_to_rootfs(__initramfs_start, | 588 | unpack_to_rootfs(__initramfs_start, __initramfs_size); |
| 589 | __initramfs_end - __initramfs_start); | ||
| 590 | } | 589 | } |
| 591 | printk(KERN_INFO "rootfs image is not initramfs (%s)" | 590 | printk(KERN_INFO "rootfs image is not initramfs (%s)" |
| 592 | "; looks like an initrd\n", err); | 591 | "; looks like an initrd\n", err); |