projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[deliverable/linux.git]
/
init
/
do_mounts_rd.c
diff --git
a/init/do_mounts_rd.c
b/init/do_mounts_rd.c
index a8227022e3a02210afaab0cc628729f80ca07af8..e5d059e8aa11e78c736c75f452bc641abeec09b2 100644
(file)
--- a/
init/do_mounts_rd.c
+++ b/
init/do_mounts_rd.c
@@
-311,9
+311,9
@@
static int exit_code;
static int decompress_error;
static int crd_infd, crd_outfd;
static int decompress_error;
static int crd_infd, crd_outfd;
-static
int __init compr_fill(void *buf, unsigned int
len)
+static
long __init compr_fill(void *buf, unsigned long
len)
{
{
-
int
r = sys_read(crd_infd, buf, len);
+
long
r = sys_read(crd_infd, buf, len);
if (r < 0)
printk(KERN_ERR "RAMDISK: error while reading compressed data");
else if (r == 0)
if (r < 0)
printk(KERN_ERR "RAMDISK: error while reading compressed data");
else if (r == 0)
@@
-321,13
+321,13
@@
static int __init compr_fill(void *buf, unsigned int len)
return r;
}
return r;
}
-static
int __init compr_flush(void *window, unsigned int
outcnt)
+static
long __init compr_flush(void *window, unsigned long
outcnt)
{
{
-
int
written = sys_write(crd_outfd, window, outcnt);
+
long
written = sys_write(crd_outfd, window, outcnt);
if (written != outcnt) {
if (decompress_error == 0)
printk(KERN_ERR
if (written != outcnt) {
if (decompress_error == 0)
printk(KERN_ERR
- "RAMDISK: incomplete write (%
d != %
d)\n",
+ "RAMDISK: incomplete write (%
ld != %l
d)\n",
written, outcnt);
decompress_error = 1;
return -1;
written, outcnt);
decompress_error = 1;
return -1;
This page took
0.029914 seconds
and
5
git commands to generate.