wok annotate linux/stuff/linux-freeinitrd-2.6.30.6.u @ rev 5195

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