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

Commit 46150a05 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Benjamin Herrenschmidt
Browse files

powerpc/pseries: Fix dlpar compile warning without CONFIG_PROC_DEVICETREE 



cc1: warnings being treated as errors
arch/powerpc/platforms/pseries/dlpar.c: In function 'dlpar_attach_node':
arch/powerpc/platforms/pseries/dlpar.c:239: error: unused variable 'ent'
arch/powerpc/platforms/pseries/dlpar.c: In function 'dlpar_detach_node':
arch/powerpc/platforms/pseries/dlpar.c:271: error: unused variable 'prop'
arch/powerpc/platforms/pseries/dlpar.c:270: error: unused variable 'parent'
make[3]: *** [arch/powerpc/platforms/pseries/dlpar.o] Error 1

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 92cb3694

arch/powerpc/platforms/pseries/dlpar.c

+3 −1
Original line number Diff line number Diff line
@@ -236,7 +236,9 @@ static struct device_node *derive_parent(const char *path) 


int dlpar_attach_node(struct device_node *dn)

{

#ifdef CONFIG_PROC_DEVICETREE

	struct proc_dir_entry *ent;

#endif

	int rc;



	of_node_set_flag(dn, OF_DYNAMIC);
@@ -267,10 +269,10 @@ int dlpar_attach_node(struct device_node *dn) 


int dlpar_detach_node(struct device_node *dn)

{

#ifdef CONFIG_PROC_DEVICETREE

	struct device_node *parent = dn->parent;

	struct property *prop = dn->properties;



#ifdef CONFIG_PROC_DEVICETREE

	while (prop) {

		remove_proc_entry(prop->name, dn->pde);

		prop = prop->next;