git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
ppc
/
mm
/
pgtable.c
diff --git
a/arch/ppc/mm/pgtable.c
b/arch/ppc/mm/pgtable.c
index
3048285
..
b5316b4
100644
(file)
--- a/
arch/ppc/mm/pgtable.c
+++ b/
arch/ppc/mm/pgtable.c
@@
-85,8
+85,7
@@
pgd_t *pgd_alloc(struct mm_struct *mm)
{
pgd_t *ret;
{
pgd_t *ret;
- if ((ret = (pgd_t *)__get_free_pages(GFP_KERNEL, PGDIR_ORDER)) != NULL)
- clear_pages(ret, PGDIR_ORDER);
+ ret = (pgd_t *)__get_free_pages(GFP_KERNEL|__GFP_ZERO, PGDIR_ORDER);
return ret;
}
return ret;
}
@@
-102,16
+101,17
@@
pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
extern void *early_get_page(void);
if (mem_init_done) {
extern void *early_get_page(void);
if (mem_init_done) {
- pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT);
+ pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT
|__GFP_ZERO
);
if (pte) {
struct page *ptepage = virt_to_page(pte);
ptepage->mapping = (void *) mm;
ptepage->index = address & PMD_MASK;
}
if (pte) {
struct page *ptepage = virt_to_page(pte);
ptepage->mapping = (void *) mm;
ptepage->index = address & PMD_MASK;
}
- } else
+ } else
{
pte = (pte_t *)early_get_page();
pte = (pte_t *)early_get_page();
- if (pte)
- clear_page(pte);
+ if (pte)
+ clear_page(pte);
+ }
return pte;
}
return pte;
}
@@
-153,19
+153,19
@@
void pte_free(struct page *ptepage)
}
#ifndef CONFIG_44x
}
#ifndef CONFIG_44x
-void *
+void
__iomem
*
ioremap(phys_addr_t addr, unsigned long size)
{
return __ioremap(addr, size, _PAGE_NO_CACHE);
}
#else /* CONFIG_44x */
ioremap(phys_addr_t addr, unsigned long size)
{
return __ioremap(addr, size, _PAGE_NO_CACHE);
}
#else /* CONFIG_44x */
-void *
+void
__iomem
*
ioremap64(unsigned long long addr, unsigned long size)
{
return __ioremap(addr, size, _PAGE_NO_CACHE);
}
ioremap64(unsigned long long addr, unsigned long size)
{
return __ioremap(addr, size, _PAGE_NO_CACHE);
}
-void *
+void
__iomem
*
ioremap(phys_addr_t addr, unsigned long size)
{
phys_addr_t addr64 = fixup_bigphys_addr(addr, size);
ioremap(phys_addr_t addr, unsigned long size)
{
phys_addr_t addr64 = fixup_bigphys_addr(addr, size);
@@
-174,7
+174,7
@@
ioremap(phys_addr_t addr, unsigned long size)
}
#endif /* CONFIG_44x */
}
#endif /* CONFIG_44x */
-void *
+void
__iomem
*
__ioremap(phys_addr_t addr, unsigned long size, unsigned long flags)
{
unsigned long v, i;
__ioremap(phys_addr_t addr, unsigned long size, unsigned long flags)
{
unsigned long v, i;
@@
-257,10
+257,10
@@
__ioremap(phys_addr_t addr, unsigned long size, unsigned long flags)
}
out:
}
out:
- return (void *) (v + ((unsigned long)addr & ~PAGE_MASK));
+ return (void
__iomem
*) (v + ((unsigned long)addr & ~PAGE_MASK));
}
}
-void iounmap(vo
id
*addr)
+void iounmap(vo
latile void __iomem
*addr)
{
/*
* If mapped by BATs then there is nothing to do.
{
/*
* If mapped by BATs then there is nothing to do.