diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-04-02 20:58:52 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:55:18 -0400 |
commit | 1a38147ed0737a9c01dbf5f2ca47fd2a0aa5cb55 (patch) | |
tree | cd8ace4daea50a2a8c4bc19db156163e9f7aefb3 /arch/powerpc/kernel | |
parent | 9213feea6e197f8507ec855337798cc3388f5570 (diff) |
[POWERPC] Make struct property's value a void *
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/machine_kexec_64.c | 10 | ||||
-rw-r--r-- | arch/powerpc/kernel/pci_32.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/prom.c | 5 |
3 files changed, 9 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c index a24b09c27718..b975b5b0e3d5 100644 --- a/arch/powerpc/kernel/machine_kexec_64.c +++ b/arch/powerpc/kernel/machine_kexec_64.c | |||
@@ -294,19 +294,19 @@ static unsigned long htab_base, kernel_end; | |||
294 | static struct property htab_base_prop = { | 294 | static struct property htab_base_prop = { |
295 | .name = "linux,htab-base", | 295 | .name = "linux,htab-base", |
296 | .length = sizeof(unsigned long), | 296 | .length = sizeof(unsigned long), |
297 | .value = (unsigned char *)&htab_base, | 297 | .value = &htab_base, |
298 | }; | 298 | }; |
299 | 299 | ||
300 | static struct property htab_size_prop = { | 300 | static struct property htab_size_prop = { |
301 | .name = "linux,htab-size", | 301 | .name = "linux,htab-size", |
302 | .length = sizeof(unsigned long), | 302 | .length = sizeof(unsigned long), |
303 | .value = (unsigned char *)&htab_size_bytes, | 303 | .value = &htab_size_bytes, |
304 | }; | 304 | }; |
305 | 305 | ||
306 | static struct property kernel_end_prop = { | 306 | static struct property kernel_end_prop = { |
307 | .name = "linux,kernel-end", | 307 | .name = "linux,kernel-end", |
308 | .length = sizeof(unsigned long), | 308 | .length = sizeof(unsigned long), |
309 | .value = (unsigned char *)&kernel_end, | 309 | .value = &kernel_end, |
310 | }; | 310 | }; |
311 | 311 | ||
312 | static void __init export_htab_values(void) | 312 | static void __init export_htab_values(void) |
@@ -335,7 +335,7 @@ static void __init export_htab_values(void) | |||
335 | static struct property crashk_base_prop = { | 335 | static struct property crashk_base_prop = { |
336 | .name = "linux,crashkernel-base", | 336 | .name = "linux,crashkernel-base", |
337 | .length = sizeof(unsigned long), | 337 | .length = sizeof(unsigned long), |
338 | .value = (unsigned char *)&crashk_res.start, | 338 | .value = &crashk_res.start, |
339 | }; | 339 | }; |
340 | 340 | ||
341 | static unsigned long crashk_size; | 341 | static unsigned long crashk_size; |
@@ -343,7 +343,7 @@ static unsigned long crashk_size; | |||
343 | static struct property crashk_size_prop = { | 343 | static struct property crashk_size_prop = { |
344 | .name = "linux,crashkernel-size", | 344 | .name = "linux,crashkernel-size", |
345 | .length = sizeof(unsigned long), | 345 | .length = sizeof(unsigned long), |
346 | .value = (unsigned char *)&crashk_size, | 346 | .value = &crashk_size, |
347 | }; | 347 | }; |
348 | 348 | ||
349 | static void __init export_crashk_values(void) | 349 | static void __init export_crashk_values(void) |
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c index ecc765819305..e99ffe2140bf 100644 --- a/arch/powerpc/kernel/pci_32.c +++ b/arch/powerpc/kernel/pci_32.c | |||
@@ -1012,7 +1012,7 @@ pci_create_OF_bus_map(void) | |||
1012 | memset(of_prop, -1, sizeof(struct property) + 256); | 1012 | memset(of_prop, -1, sizeof(struct property) + 256); |
1013 | of_prop->name = "pci-OF-bus-map"; | 1013 | of_prop->name = "pci-OF-bus-map"; |
1014 | of_prop->length = 256; | 1014 | of_prop->length = 256; |
1015 | of_prop->value = (unsigned char *)&of_prop[1]; | 1015 | of_prop->value = &of_prop[1]; |
1016 | prom_add_property(find_path_device("/"), of_prop); | 1016 | prom_add_property(find_path_device("/"), of_prop); |
1017 | } | 1017 | } |
1018 | } | 1018 | } |
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 2890ce3d6641..ec6921c54a07 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c | |||
@@ -390,12 +390,13 @@ static unsigned long __init unflatten_dt_node(unsigned long mem, | |||
390 | if (allnextpp) { | 390 | if (allnextpp) { |
391 | pp->name = "name"; | 391 | pp->name = "name"; |
392 | pp->length = sz; | 392 | pp->length = sz; |
393 | pp->value = (unsigned char *)(pp + 1); | 393 | pp->value = pp + 1; |
394 | *prev_pp = pp; | 394 | *prev_pp = pp; |
395 | prev_pp = &pp->next; | 395 | prev_pp = &pp->next; |
396 | memcpy(pp->value, ps, sz - 1); | 396 | memcpy(pp->value, ps, sz - 1); |
397 | ((char *)pp->value)[sz - 1] = 0; | 397 | ((char *)pp->value)[sz - 1] = 0; |
398 | DBG("fixed up name for %s -> %s\n", pathp, pp->value); | 398 | DBG("fixed up name for %s -> %s\n", pathp, |
399 | (char *)pp->value); | ||
399 | } | 400 | } |
400 | } | 401 | } |
401 | if (allnextpp) { | 402 | if (allnextpp) { |