projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[powerpc.git]
/
arch
/
x86_64
/
kernel
/
machine_kexec.c
diff --git
a/arch/x86_64/kernel/machine_kexec.c
b/arch/x86_64/kernel/machine_kexec.c
index
0497e3b
..
c3a5547
100644
(file)
--- a/
arch/x86_64/kernel/machine_kexec.c
+++ b/
arch/x86_64/kernel/machine_kexec.c
@@
-189,21
+189,21
@@
NORET_TYPE void machine_kexec(struct kimage *image)
control_page = page_address(image->control_code_page) + PAGE_SIZE;
memcpy(control_page, relocate_kernel, PAGE_SIZE);
control_page = page_address(image->control_code_page) + PAGE_SIZE;
memcpy(control_page, relocate_kernel, PAGE_SIZE);
- page_list[PA_CONTROL_PAGE] =
__pa
(control_page);
+ page_list[PA_CONTROL_PAGE] =
virt_to_phys
(control_page);
page_list[VA_CONTROL_PAGE] = (unsigned long)relocate_kernel;
page_list[VA_CONTROL_PAGE] = (unsigned long)relocate_kernel;
- page_list[PA_PGD] =
__pa(
kexec_pgd);
+ page_list[PA_PGD] =
virt_to_phys(&
kexec_pgd);
page_list[VA_PGD] = (unsigned long)kexec_pgd;
page_list[VA_PGD] = (unsigned long)kexec_pgd;
- page_list[PA_PUD_0] =
__pa(
kexec_pud0);
+ page_list[PA_PUD_0] =
virt_to_phys(&
kexec_pud0);
page_list[VA_PUD_0] = (unsigned long)kexec_pud0;
page_list[VA_PUD_0] = (unsigned long)kexec_pud0;
- page_list[PA_PMD_0] =
__pa(
kexec_pmd0);
+ page_list[PA_PMD_0] =
virt_to_phys(&
kexec_pmd0);
page_list[VA_PMD_0] = (unsigned long)kexec_pmd0;
page_list[VA_PMD_0] = (unsigned long)kexec_pmd0;
- page_list[PA_PTE_0] =
__pa(
kexec_pte0);
+ page_list[PA_PTE_0] =
virt_to_phys(&
kexec_pte0);
page_list[VA_PTE_0] = (unsigned long)kexec_pte0;
page_list[VA_PTE_0] = (unsigned long)kexec_pte0;
- page_list[PA_PUD_1] =
__pa(
kexec_pud1);
+ page_list[PA_PUD_1] =
virt_to_phys(&
kexec_pud1);
page_list[VA_PUD_1] = (unsigned long)kexec_pud1;
page_list[VA_PUD_1] = (unsigned long)kexec_pud1;
- page_list[PA_PMD_1] =
__pa(
kexec_pmd1);
+ page_list[PA_PMD_1] =
virt_to_phys(&
kexec_pmd1);
page_list[VA_PMD_1] = (unsigned long)kexec_pmd1;
page_list[VA_PMD_1] = (unsigned long)kexec_pmd1;
- page_list[PA_PTE_1] =
__pa(
kexec_pte1);
+ page_list[PA_PTE_1] =
virt_to_phys(&
kexec_pte1);
page_list[VA_PTE_1] = (unsigned long)kexec_pte1;
page_list[PA_TABLE_PAGE] =
page_list[VA_PTE_1] = (unsigned long)kexec_pte1;
page_list[PA_TABLE_PAGE] =