qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-04 05:57:28 +03:00
Code

[brcm47xx] use vmalloc instead of kmalloc when reserving space for the lzma initramfs (#3488)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15534 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2009-05-01 09:23:31 +00:00
parent 6b56d44a7b
commit 21dcc33bff
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
target/linux/brcm47xx/patches-2.6.28/500-lzma_initramfs.patch
View File

@ -1,6 +1,14 @@
--- a/init/initramfs.c --- a/init/initramfs.c 2009-03-23 22:55:52.000000000 +0100
+++ b/init/initramfs.c +++ b/init/initramfs.c 2009-05-01 11:15:46.000000000 +0200
@@ -475,6 +475,69 @@ static void __init flush_window(void) @@ -7,6 +7,7 @@
#include <linux/string.h>
#include <linux/syscalls.h>
#include <linux/utime.h>
+#include <linux/vmalloc.h>
static __initdata char *message;
static void __init error(char *x)
@@ -475,6 +476,69 @@
outcnt = 0; outcnt = 0;
} }
@ -40,13 +48,13 @@
+ workspace_size = ((LZMA_BASE_SIZE + (LZMA_LIT_SIZE << (lc + lp))) * sizeof(CProb)) + 100; + workspace_size = ((LZMA_BASE_SIZE + (LZMA_LIT_SIZE << (lc + lp))) * sizeof(CProb)) + 100;
+ printk( KERN_NOTICE "initramfs: LZMA lc=%d,lp=%d,pb=%d,origSize=%d\n", + printk( KERN_NOTICE "initramfs: LZMA lc=%d,lp=%d,pb=%d,origSize=%d\n",
+ lc,lp,pb,osize); + lc,lp,pb,osize);
+ outputbuffer = kmalloc(osize, GFP_KERNEL); + outputbuffer = vmalloc(osize);
+ if (outputbuffer == 0) { + if (outputbuffer == 0) {
+ printk(KERN_ERR "initramfs: Couldn't allocate lzma output buffer\n"); + printk(KERN_ERR "initramfs: Couldn't allocate lzma output buffer\n");
+ return -1; + return -1;
+ } + }
+ +
+ workspace = kmalloc(workspace_size, GFP_KERNEL); + workspace = vmalloc(workspace_size);
+ if (workspace == NULL) { + if (workspace == NULL) {
+ printk(KERN_ERR "initramfs: Couldn't allocate lzma workspace\n"); + printk(KERN_ERR "initramfs: Couldn't allocate lzma workspace\n");
+ return -1; + return -1;
@ -61,8 +69,8 @@
+ flush_buffer(outputbuffer, outsizeProcessed); + flush_buffer(outputbuffer, outsizeProcessed);
+ inptr = insize; + inptr = insize;
+ +
+ kfree(outputbuffer); + vfree(outputbuffer);
+ kfree(workspace); + vfree(workspace);
+ state = Reset; + state = Reset;
+ return 0; + return 0;
+} +}
@ -70,7 +78,7 @@
static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only) static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
{ {
int written; int written;
@@ -509,12 +572,28 @@ static char * __init unpack_to_rootfs(ch @@ -509,12 +573,28 @@
inptr = 0; inptr = 0;
outcnt = 0; /* bytes in output buffer */ outcnt = 0; /* bytes in output buffer */
bytes_out = 0; bytes_out = 0;
@ -104,9 +112,9 @@
buf += inptr; buf += inptr;
len -= inptr; len -= inptr;
} }
--- a/scripts/gen_initramfs_list.sh --- a/scripts/gen_initramfs_list.sh 2009-03-23 22:55:52.000000000 +0100
+++ b/scripts/gen_initramfs_list.sh +++ b/scripts/gen_initramfs_list.sh 2009-05-01 11:12:45.000000000 +0200
@@ -287,7 +287,7 @@ if [ ! -z ${output_file} ]; then @@ -287,7 +287,7 @@
if [ "${is_cpio_compressed}" = "compressed" ]; then if [ "${is_cpio_compressed}" = "compressed" ]; then
cat ${cpio_tfile} > ${output_file} cat ${cpio_tfile} > ${output_file}
else else