wok-stable annotate linux/stuff/linux-freeinitrd-2.6.33.2.u @ rev 5425

git: needs gnu tar
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue May 04 21:04:56 2010 +0200 (2010-05-04)
parents
children
rev   line source
pankso@5245 1 --- linux-2.6.30.4/arch/x86/mm/init.c
pankso@5245 2 +++ linux-2.6.30.4/arch/x86/mm/init.c
pankso@5245 3 @@ -381,7 +381,7 @@
pankso@5245 4 */
pankso@5245 5 set_memory_rw(begin, (end - begin) >> PAGE_SHIFT);
pankso@5245 6
pankso@5245 7 - printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);
pankso@5245 8 + if (what) printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);
pankso@5245 9
pankso@5245 10 for (; addr < end; addr += PAGE_SIZE) {
pankso@5245 11 ClearPageReserved(virt_to_page(addr));
pankso@5245 12
pankso@5245 13 --- linux-2.6.30.4/init/initramfs.c
pankso@5245 14 +++ linux-2.6.30.4/init/initramfs.c
pankso@5245 15 @@ -374,6 +374,52 @@
pankso@5245 16 [Reset] = do_reset,
pankso@5245 17 };
pankso@5245 18
pankso@5245 19 +#include <linux/initrd.h>
pankso@5245 20 +#define INITRD_PAGE ((PAGE_SIZE > 64*1024) ? PAGE_SIZE : 64*1024)
pankso@5245 21 +#define INITRD_DOT (1024*1024)
pankso@5245 22 +
pankso@5245 23 +static void free_rootfs_mem(unsigned long start, unsigned long end)
pankso@5245 24 +{
pankso@5245 25 + free_init_pages(NULL, start, end);
pankso@5245 26 +}
pankso@5245 27 +
pankso@5245 28 +static void _free_initrd(unsigned long initrd_start, unsigned long initrd_end,
pankso@5245 29 + void (*free_initrd_mem)(unsigned long, unsigned long));
pankso@5245 30 +
pankso@5245 31 +static struct {
pankso@5245 32 + int offset, last, inptr, freed;
pankso@5245 33 + char *max;
pankso@5245 34 +} fill;
pankso@5245 35 +
pankso@5245 36 +static void release_inbuf(unsigned n)
pankso@5245 37 +{
pankso@5245 38 + if (n >= INITRD_PAGE) {
pankso@5245 39 + unsigned rem = n % INITRD_PAGE;
pankso@5245 40 + unsigned end = initrd_start + n - rem;
pankso@5245 41 + _free_initrd(initrd_start, end, free_rootfs_mem);
pankso@5245 42 + fill.freed += n - rem;
pankso@5245 43 + if (fill.freed >= INITRD_DOT) {
pankso@5245 44 + fill.freed -= INITRD_DOT;
pankso@5245 45 + printk(".");
pankso@5245 46 + }
pankso@5245 47 + initrd_start = end;
pankso@5245 48 + fill.offset = rem;
pankso@5245 49 + }
pankso@5245 50 +}
pankso@5245 51 +
pankso@5245 52 +static int fill_buffer(void *buffer, unsigned size)
pankso@5245 53 +{
pankso@5245 54 + int max = fill.max - (char *) initrd_start - fill.offset;
pankso@5245 55 + if (max > size) max = size;
pankso@5245 56 + if (max > INITRD_PAGE) max = INITRD_PAGE;
pankso@5245 57 + memcpy(buffer, (void *)(initrd_start + fill.offset), max);
pankso@5245 58 + release_inbuf(fill.offset);
pankso@5245 59 + fill.offset += max;
pankso@5245 60 + fill.inptr += fill.last;
pankso@5245 61 + fill.last = max;
pankso@5245 62 + return max;
pankso@5245 63 +}
pankso@5245 64 +
pankso@5245 65 static int __init write_buffer(char *buf, unsigned len)
pankso@5245 66 {
pankso@5245 67 count = len;
pankso@5245 68 @@ -418,6 +463,7 @@
pankso@5245 69 decompress_fn decompress;
pankso@5245 70 const char *compress_name;
pankso@5245 71 static __initdata char msg_buf[64];
pankso@5245 72 + int early_free_initrd = (buf == (char *) initrd_start);
pankso@5245 73
pankso@5245 74 header_buf = kmalloc(110, GFP_KERNEL);
pankso@5245 75 symlink_buf = kmalloc(PATH_MAX + N_ALIGN(PATH_MAX) + 1, GFP_KERNEL);
pankso@5245 76 @@ -431,11 +478,16 @@
pankso@5245 77 message = NULL;
pankso@5245 78 while (!message && len) {
pankso@5245 79 loff_t saved_offset = this_header;
pankso@5245 80 + fill.offset = buf - (char *) initrd_start;
pankso@5245 81 + fill.max = buf + len;
pankso@5245 82 + fill.inptr = fill.last = fill.freed = 0;
pankso@5245 83 if (*buf == '0' && !(this_header & 3)) {
pankso@5245 84 state = Start;
pankso@5245 85 written = write_buffer(buf, len);
pankso@5245 86 buf += written;
pankso@5245 87 len -= written;
pankso@5245 88 + if (early_free_initrd)
pankso@5245 89 + release_inbuf(buf - (char *) initrd_start);
pankso@5245 90 continue;
pankso@5245 91 }
pankso@5245 92 if (!*buf) {
pankso@5245 93 @@ -446,9 +497,15 @@
pankso@5245 94 }
pankso@5245 95 this_header = 0;
pankso@5245 96 decompress = decompress_method(buf, len, &compress_name);
pankso@5245 97 - if (decompress)
pankso@5245 98 - decompress(buf, len, NULL, flush_buffer, NULL,
pankso@5245 99 + if (decompress) {
pankso@5245 100 + if (early_free_initrd) {
pankso@5245 101 + decompress(NULL, 0, fill_buffer, flush_buffer,
pankso@5245 102 + NULL, &my_inptr, error);
pankso@5245 103 + my_inptr += fill.inptr;
pankso@5245 104 + }
pankso@5245 105 + else decompress(buf, len, NULL, flush_buffer, NULL,
pankso@5245 106 &my_inptr, error);
pankso@5245 107 + }
pankso@5245 108 else if (compress_name) {
pankso@5245 109 if (!message) {
pankso@5245 110 snprintf(msg_buf, sizeof msg_buf,
pankso@5245 111 @@ -485,7 +543,8 @@
pankso@5245 112 #include <linux/initrd.h>
pankso@5245 113 #include <linux/kexec.h>
pankso@5245 114
pankso@5245 115 -static void __init free_initrd(void)
pankso@5245 116 +static void _free_initrd(unsigned long initrd_start, unsigned long initrd_end,
pankso@5245 117 + void (*free_initrd_mem)(unsigned long, unsigned long))
pankso@5245 118 {
pankso@5245 119 #ifdef CONFIG_KEXEC
pankso@5245 120 unsigned long crashk_start = (unsigned long)__va(crashk_res.start);
pankso@5245 121 @@ -513,6 +571,12 @@
pankso@5245 122 #endif
pankso@5245 123 free_initrd_mem(initrd_start, initrd_end);
pankso@5245 124 skip:
pankso@5245 125 + ;
pankso@5245 126 +}
pankso@5245 127 +
pankso@5245 128 +static void __init free_initrd(void)
pankso@5245 129 +{
pankso@5245 130 + _free_initrd(initrd_start, initrd_end, free_initrd_mem);
pankso@5245 131 initrd_start = 0;
pankso@5245 132 initrd_end = 0;
pankso@5245 133 }