git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86: section/warning fixes
[pandora-kernel.git]
/
arch
/
x86
/
mm
/
init_64.c
diff --git
a/arch/x86/mm/init_64.c
b/arch/x86/mm/init_64.c
index
32ba13b
..
f6d20be
100644
(file)
--- a/
arch/x86/mm/init_64.c
+++ b/
arch/x86/mm/init_64.c
@@
-135,7
+135,7
@@
static __init void *spp_getpage(void)
return ptr;
}
return ptr;
}
-static void
+static
__init
void
set_pte_phys(unsigned long vaddr, unsigned long phys, pgprot_t prot)
{
pgd_t *pgd;
set_pte_phys(unsigned long vaddr, unsigned long phys, pgprot_t prot)
{
pgd_t *pgd;
@@
-206,7
+206,7
@@
void __init cleanup_highmap(void)
pmd_t *last_pmd = pmd + PTRS_PER_PMD;
for (; pmd < last_pmd; pmd++, vaddr += PMD_SIZE) {
pmd_t *last_pmd = pmd + PTRS_PER_PMD;
for (; pmd < last_pmd; pmd++, vaddr += PMD_SIZE) {
- if (
!pmd_present
(*pmd))
+ if (
pmd_none
(*pmd))
continue;
if (vaddr < (unsigned long) _text || vaddr > end)
set_pmd(pmd, __pmd(0));
continue;
if (vaddr < (unsigned long) _text || vaddr > end)
set_pmd(pmd, __pmd(0));
@@
-214,7
+214,7
@@
void __init cleanup_highmap(void)
}
/* NOTE: this is meant to be run only at boot */
}
/* NOTE: this is meant to be run only at boot */
-void __set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot)
+void __
init __
set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot)
{
unsigned long address = __fix_to_virt(idx);
{
unsigned long address = __fix_to_virt(idx);