diff options
| author | Michael Ellerman | 2018-10-09 07:51:05 +0200 |
|---|---|---|
| committer | Michael Ellerman | 2018-10-09 07:51:05 +0200 |
| commit | 9b7e4d601baac83a7104652042107ce94f245524 (patch) | |
| tree | 1ed938abb14fd861b5c28d6df90d7508a1cb5184 /arch/powerpc/platforms | |
| parent | macintosh/via-macii, macintosh/adb-iop: Clean up whitespace (diff) | |
| parent | powerpc/numa: Skip onlining a offline node in kdump path (diff) | |
| download | kernel-qcow2-linux-9b7e4d601baac83a7104652042107ce94f245524.tar.gz kernel-qcow2-linux-9b7e4d601baac83a7104652042107ce94f245524.tar.xz kernel-qcow2-linux-9b7e4d601baac83a7104652042107ce94f245524.zip | |
Merge branch 'fixes' into next
Merge our fixes branch. It has a few important fixes that are needed for
futher testing and also some commits that will conflict with content in
next.
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/powernv/pci-ioda-tce.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powernv/pci-ioda-tce.c b/arch/powerpc/platforms/powernv/pci-ioda-tce.c index 6c5db1acbe8d..fe9691040f54 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda-tce.c +++ b/arch/powerpc/platforms/powernv/pci-ioda-tce.c @@ -276,7 +276,7 @@ long pnv_pci_ioda2_table_alloc_pages(int nid, __u64 bus_offset, level_shift = entries_shift + 3; level_shift = max_t(unsigned int, level_shift, PAGE_SHIFT); - if ((level_shift - 3) * levels + page_shift >= 60) + if ((level_shift - 3) * levels + page_shift >= 55) return -EINVAL; /* Allocate TCE table */ |