diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /arch/powerpc/kernel/eeh.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'arch/powerpc/kernel/eeh.c')
| -rw-r--r-- | arch/powerpc/kernel/eeh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c index c9bc78e9c610..7429556eb8df 100644 --- a/arch/powerpc/kernel/eeh.c +++ b/arch/powerpc/kernel/eeh.c | |||
| @@ -168,10 +168,10 @@ static size_t eeh_dump_dev_log(struct eeh_dev *edev, char *buf, size_t len) | |||
| 168 | int n = 0, l = 0; | 168 | int n = 0, l = 0; |
| 169 | char buffer[128]; | 169 | char buffer[128]; |
| 170 | 170 | ||
| 171 | n += scnprintf(buf+n, len-n, "%04x:%02x:%02x:%01x\n", | 171 | n += scnprintf(buf+n, len-n, "%04x:%02x:%02x.%01x\n", |
| 172 | edev->phb->global_number, pdn->busno, | 172 | edev->phb->global_number, pdn->busno, |
| 173 | PCI_SLOT(pdn->devfn), PCI_FUNC(pdn->devfn)); | 173 | PCI_SLOT(pdn->devfn), PCI_FUNC(pdn->devfn)); |
| 174 | pr_warn("EEH: of node=%04x:%02x:%02x:%01x\n", | 174 | pr_warn("EEH: of node=%04x:%02x:%02x.%01x\n", |
| 175 | edev->phb->global_number, pdn->busno, | 175 | edev->phb->global_number, pdn->busno, |
| 176 | PCI_SLOT(pdn->devfn), PCI_FUNC(pdn->devfn)); | 176 | PCI_SLOT(pdn->devfn), PCI_FUNC(pdn->devfn)); |
| 177 | 177 | ||