diff options
| author | Scott Wood <scottwood@freescale.com> | 2015-03-16 18:30:18 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2015-03-16 18:45:00 (GMT) |
| commit | 1744323ccc02b3b5188750b2a31f5e262011defe (patch) | |
| tree | becb0c581021062da653a8b120105c3febb6be7b /arch | |
| parent | 838bc542d9a8b00ce3c5f84d09c8e7a8f3d60da7 (diff) | |
| download | linux-fsl-qoriq-1744323ccc02b3b5188750b2a31f5e262011defe.tar.xz | |
Revert "Revert "powerpc/hugetlb: Replace __get_cpu_var with get_cpu_var""
This reverts commit 978464fa78fef73e7c225e3a316662b6bfd1c261.
Change-Id: I7d529835a9503cfc130da2da7bcda536b9c58762
Reviewed-on: http://git.am.freescale.net:8181/32820
Reviewed-by: Scott Wood <scottwood@freescale.com>
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/mm/hugetlbpage.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index 834ca8e..a0537d1 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c @@ -462,12 +462,13 @@ static void hugepd_free(struct mmu_gather *tlb, void *hugepte) { struct hugepd_freelist **batchp; - batchp = &__get_cpu_var(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); return; } @@ -481,6 +482,7 @@ static void hugepd_free(struct mmu_gather *tlb, void *hugepte) call_rcu_sched(&(*batchp)->rcu, hugepd_free_rcu_callback); *batchp = NULL; } + put_cpu_var(hugepd_freelist_cur); } #endif |