diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2014-05-14 11:52:01 -0700 |
|---|---|---|
| committer | Riham Haidar <rhaidar@nvidia.com> | 2014-05-27 18:45:32 -0700 |
| commit | 33f4e80db50ade81145bd631b1a2d48ba6fe89c6 (patch) | |
| tree | 9f0e681fbea0a584e2a3d34b3d58ca7d6d6a2e7a /arch/arm/kvm | |
| parent | ee0ba58660dc5cd86fc2296b4960943e0df60e5f (diff) | |
fixup! ARM: 7862/1: pcpu: replace __get_cpu_var_uses
The kvm/arm.c conflict resolution from the backport mistakenly brought
back part of dac288f7b38a7439502b77dabcdf8a9a5c4ae721 as well. Remove
that change.
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Change-Id: I4e11b6eaa7f7a6afd30e7d6957ea9960c2bea2f5
Reviewed-on: http://git-master/r/409757
Reviewed-by: Ishan Mittal <imittal@nvidia.com>
Tested-by: Ishan Mittal <imittal@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'arch/arm/kvm')
| -rw-r--r-- | arch/arm/kvm/arm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index 28bf2cf781a7..55914aa7b2d7 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -809,8 +809,8 @@ static void cpu_init_hyp_mode(void *dummy) /* Switch from the HYP stub to our own HYP init vector */ __hyp_set_vectors(kvm_get_idmap_vector()); - boot_pgd_ptr = kvm_mmu_get_boot_httbr(); - pgd_ptr = kvm_mmu_get_httbr(); + boot_pgd_ptr = (unsigned long long)kvm_mmu_get_boot_httbr(); + pgd_ptr = (unsigned long long)kvm_mmu_get_httbr(); stack_page = __this_cpu_read(kvm_arm_hyp_stack_page); hyp_stack_ptr = stack_page + PAGE_SIZE; vector_ptr = (unsigned long)__kvm_hyp_vector; |