Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a38147e authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[POWERPC] Make struct property's value a void * 



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 9213feea

arch/powerpc/kernel/machine_kexec_64.c

+5 −5
Original line number Diff line number Diff line
@@ -294,19 +294,19 @@ static unsigned long htab_base, kernel_end; 
static struct property htab_base_prop = {

	.name = "linux,htab-base",

	.length = sizeof(unsigned long),

	.value = (unsigned char *)&htab_base,

	.value = &htab_base,

};



static struct property htab_size_prop = {

	.name = "linux,htab-size",

	.length = sizeof(unsigned long),

	.value = (unsigned char *)&htab_size_bytes,

	.value = &htab_size_bytes,

};



static struct property kernel_end_prop = {

	.name = "linux,kernel-end",

	.length = sizeof(unsigned long),

	.value = (unsigned char *)&kernel_end,

	.value = &kernel_end,

};



static void __init export_htab_values(void)
@@ -335,7 +335,7 @@ static void __init export_htab_values(void) 
static struct property crashk_base_prop = {

	.name = "linux,crashkernel-base",

	.length = sizeof(unsigned long),

	.value = (unsigned char *)&crashk_res.start,

	.value = &crashk_res.start,

};



static unsigned long crashk_size;
@@ -343,7 +343,7 @@ static unsigned long crashk_size; 
static struct property crashk_size_prop = {

	.name = "linux,crashkernel-size",

	.length = sizeof(unsigned long),

	.value = (unsigned char *)&crashk_size,

	.value = &crashk_size,

};



static void __init export_crashk_values(void)

arch/powerpc/kernel/pci_32.c

+1 −1
Original line number Diff line number Diff line
@@ -1012,7 +1012,7 @@ pci_create_OF_bus_map(void) 
		memset(of_prop, -1, sizeof(struct property) + 256);

		of_prop->name = "pci-OF-bus-map";

		of_prop->length = 256;

		of_prop->value = (unsigned char *)&of_prop[1];

		of_prop->value = &of_prop[1];

		prom_add_property(find_path_device("/"), of_prop);

	}

}

arch/powerpc/kernel/prom.c

+3 −2
Original line number Diff line number Diff line
@@ -390,12 +390,13 @@ static unsigned long __init unflatten_dt_node(unsigned long mem, 
		if (allnextpp) {

			pp->name = "name";

			pp->length = sz;

			pp->value = (unsigned char *)(pp + 1);

			pp->value = pp + 1;

			*prev_pp = pp;

			prev_pp = &pp->next;

			memcpy(pp->value, ps, sz - 1);

			((char *)pp->value)[sz - 1] = 0;

			DBG("fixed up name for %s -> %s\n", pathp, pp->value);

			DBG("fixed up name for %s -> %s\n", pathp,

				(char *)pp->value);

		}

	}

	if (allnextpp) {

arch/powerpc/platforms/maple/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static void __init fixup_bus_range(struct device_node *bridge) 
			       bridge->full_name);

		return;

	}

	bus_range = (int *)prop->value;

	bus_range = prop->value;

	bus_range[1] = fixup_one_level_bus_range(bridge->child, bus_range[1]);

}

arch/powerpc/platforms/powermac/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static void __init fixup_bus_range(struct device_node *bridge) 
	if (prop == NULL || prop->length < 2 * sizeof(int))

		return;



	bus_range = (int *)prop->value;

	bus_range = prop->value;

	bus_range[1] = fixup_one_level_bus_range(bridge->child, bus_range[1]);

}