lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'eeh' into next

Browse Source
This commit is contained in:
Benjamin Herrenschmidt
2012-03-13 10:15:35 +11:00
parent 7230c56441 3780444c4f
commit aba0eb84c8
19 changed files with 1479 additions and 869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/kernel/of_platform.c
View File

@ -21,12 +21,13 @@
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/of_platform.h>
#include <linux/atomic.h>
#include <asm/errno.h>
#include <asm/topology.h>
#include <asm/pci-bridge.h>
#include <asm/ppc-pci.h>
#include <linux/atomic.h>
#include <asm/eeh.h>
#ifdef CONFIG_PPC_OF_PLATFORM_PCI
@ -66,6 +67,9 @@ static int __devinit of_pci_phb_probe(struct platform_device *dev)
/* Init pci_dn data structures */
pci_devs_phb_init_dynamic(phb);
/* Create EEH devices for the PHB */
eeh_dev_phb_init_dynamic(phb);
/* Register devices with EEH */
#ifdef CONFIG_EEH
if (dev->dev.of_node->child)

3
arch/powerpc/kernel/rtas_pci.c
View File

@ -275,6 +275,9 @@ void __init find_and_init_phbs(void)
of_node_put(root);
pci_devs_phb_init();
/* Create EEH devices for all PHBs */
eeh_dev_phb_init();
/*
* pci_probe_only and pci_assign_all_buses can be set via properties
* in chosen.