Commit f1516701 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-6.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Madhavan Srinivasan:

 - Fix htmldocs errors in sysfs-bus-event_source-devices-vpa-pmu

 - Fix warning due to missing #size-cells on powermac

Thanks to Michael Ellerman, Yang Li, Rob Herring, and Stephen Rothwell.

* tag 'powerpc-6.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/prom_init: Fixup missing powermac #size-cells
  docs: ABI: sysfs-bus-event_source-devices-vpa-pmu: Fix htmldocs errors
  powerpc/machdep: Remove duplicated include in svm.c
parents 7af08b57 cf89c943

Documentation/ABI/testing/sysfs-bus-event_source-devices-vpa-pmu

+8 −7
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Description: Read-only. Attribute group to describe the magic bits 
                Each attribute under this group defines a bit range of the

                perf_event_attr.config. Supported attribute are listed

                below::



                  event = "config:0-31" - event ID



                For example::

arch/powerpc/kernel/prom_init.c

+27 −2
Original line number Diff line number Diff line
@@ -2848,7 +2848,7 @@ static void __init fixup_device_tree_chrp(void) 
#endif



#if defined(CONFIG_PPC64) && defined(CONFIG_PPC_PMAC)

static void __init fixup_device_tree_pmac(void)

static void __init fixup_device_tree_pmac64(void)

{

	phandle u3, i2c, mpic;

	u32 u3_rev;
@@ -2888,7 +2888,31 @@ static void __init fixup_device_tree_pmac(void) 
		     &parent, sizeof(parent));

}

#else

#define fixup_device_tree_pmac()

#define fixup_device_tree_pmac64()

#endif



#ifdef CONFIG_PPC_PMAC

static void __init fixup_device_tree_pmac(void)

{

	__be32 val = 1;

	char type[8];

	phandle node;



	// Some pmacs are missing #size-cells on escc nodes

	for (node = 0; prom_next_node(&node); ) {

		type[0] = '\0';

		prom_getprop(node, "device_type", type, sizeof(type));

		if (prom_strcmp(type, "escc"))

			continue;



		if (prom_getproplen(node, "#size-cells") != PROM_ERROR)

			continue;



		prom_setprop(node, NULL, "#size-cells", &val, sizeof(val));

	}

}

#else

static inline void fixup_device_tree_pmac(void) { }

#endif



#ifdef CONFIG_PPC_EFIKA
@@ -3111,6 +3135,7 @@ static void __init fixup_device_tree(void) 
{

	fixup_device_tree_chrp();

	fixup_device_tree_pmac();

	fixup_device_tree_pmac64();

	fixup_device_tree_efika();

	fixup_device_tree_pasemi();

}

arch/powerpc/platforms/pseries/svm.c

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/memblock.h>

#include <linux/mem_encrypt.h>

#include <linux/cc_platform.h>

#include <linux/mem_encrypt.h>

#include <asm/machdep.h>

#include <asm/svm.h>

#include <asm/swiotlb.h>