git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
arm
/
boot
/
compressed
/
ofw-shark.c
diff --git
a/arch/arm/boot/compressed/ofw-shark.c
b/arch/arm/boot/compressed/ofw-shark.c
index
0d62ff3
..
465c54b
100644
(file)
--- a/
arch/arm/boot/compressed/ofw-shark.c
+++ b/
arch/arm/boot/compressed/ofw-shark.c
@@
-24,6
+24,8
@@
create_params (unsigned long *buffer)
int j,i,m,k,nr_banks,size;
unsigned char *c;
int j,i,m,k,nr_banks,size;
unsigned char *c;
+ k = 0;
+
/* Head of the taglist */
tag->hdr.tag = ATAG_CORE;
tag->hdr.size = tag_size(tag_core);
/* Head of the taglist */
tag->hdr.tag = ATAG_CORE;
tag->hdr.size = tag_size(tag_core);
@@
-254,5
+256,5
@@
asmlinkage void ofw_init(ofw_handle_t o, int *nomr, int *pointer)
temp[11]='\0';
mem_len = OF_getproplen(o,phandle, temp);
OF_getprop(o,phandle, temp, buffer, mem_len);
temp[11]='\0';
mem_len = OF_getproplen(o,phandle, temp);
OF_getprop(o,phandle, temp, buffer, mem_len);
-
(unsigned char) pointer[32]
= ((unsigned char *) buffer)[mem_len-2];
+
* ((unsigned char *) &pointer[32])
= ((unsigned char *) buffer)[mem_len-2];
}
}