diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-04-04 11:51:08 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-04-04 11:51:08 +0200 |
| commit | a99e31512aa435e8391ba5f5e64abeac9c5f2f32 (patch) | |
| tree | 56bb9d9ccfe76520b672249757e25f686275b204 /arch/powerpc/mm/hugetlbpage.c | |
| parent | 86c8dd7f4da3fb3f92fc5ab5144c971639d39745 (diff) | |
| parent | f03b24a851d32ca85dacab01785b24a7ee717d37 (diff) | |
Merge branch 'for-linus' into for-next
Conflicts:
sound/hda/hdac_i915.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'arch/powerpc/mm/hugetlbpage.c')
| -rw-r--r-- | arch/powerpc/mm/hugetlbpage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index 6dd272b6196f..d991b9e80dbb 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c @@ -413,13 +413,13 @@ static void hugepd_free(struct mmu_gather *tlb, void *hugepte) { struct hugepd_freelist **batchp; - batchp = this_cpu_ptr(&hugepd_freelist_cur); + batchp = &get_cpu_var(hugepd_freelist_cur); if (atomic_read(&tlb->mm->mm_users) < 2 || cpumask_equal(mm_cpumask(tlb->mm), cpumask_of(smp_processor_id()))) { kmem_cache_free(hugepte_cache, hugepte); - put_cpu_var(hugepd_freelist_cur); + put_cpu_var(hugepd_freelist_cur); return; } |