diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2014-12-02 14:19:20 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-12-02 14:19:20 +1100 |
| commit | b5be75d00833a3f0ff76b1d7473119be33367faa (patch) | |
| tree | 88106f598970b086f06a0d7dd123b6d00adf9f4a /arch/powerpc/platforms/pseries | |
| parent | e39f223fc93580c86ccf6b3422033e349f57f0dd (diff) | |
| parent | d557b09800dab5dd6804e5b79324069abcf0be11 (diff) | |
| download | linux-b5be75d00833a3f0ff76b1d7473119be33367faa.tar.gz | |
Merge remote-tracking branch 'benh/next' into next
Merge updates collected & acked by Ben. A few EEH patches from Gavin,
some mm updates from Aneesh and a few odds and ends.
Diffstat (limited to 'arch/powerpc/platforms/pseries')
| -rw-r--r-- | arch/powerpc/platforms/pseries/lpar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c index d214a012b026..832f221840f2 100644 --- a/arch/powerpc/platforms/pseries/lpar.c +++ b/arch/powerpc/platforms/pseries/lpar.c @@ -442,7 +442,7 @@ static void __pSeries_lpar_hugepage_invalidate(unsigned long *slot, static void pSeries_lpar_hugepage_invalidate(unsigned long vsid, unsigned long addr, unsigned char *hpte_slot_array, - int psize, int ssize) + int psize, int ssize, int local) { int i, index = 0; unsigned long s_addr = addr; |