5cbded585d
Run this: #!/bin/sh for f in $(grep -Erl "\([^\)]*\) *k[cmz]alloc" *) ; do echo "De-casting $f..." perl -pi -e "s/ ?= ?\([^\)]*\) *(k[cmz]alloc) *\(/ = \1\(/" $f done And then go through and reinstate those cases where code is casting pointers to non-pointers. And then drop a few hunks which conflicted with outstanding work. Cc: Russell King <rmk@arm.linux.org.uk>, Ian Molton <spyro@f2s.com> Cc: Mikael Starvik <starvik@axis.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: Roman Zippel <zippel@linux-m68k.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Kyle McMartin <kyle@mcmartin.ca> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jeff Dike <jdike@addtoit.com> Cc: Greg KH <greg@kroah.com> Cc: Jens Axboe <jens.axboe@oracle.com> Cc: Paul Fulghum <paulkf@microgate.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Karsten Keil <kkeil@suse.de> Cc: Mauro Carvalho Chehab <mchehab@infradead.org> Cc: Jeff Garzik <jeff@garzik.org> Cc: James Bottomley <James.Bottomley@steeleye.com> Cc: Ian Kent <raven@themaw.net> Cc: Steven French <sfrench@us.ibm.com> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Neil Brown <neilb@cse.unsw.edu.au> Cc: Jaroslav Kysela <perex@suse.cz> Cc: Takashi Iwai <tiwai@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
96 lines
1.9 KiB
C
96 lines
1.9 KiB
C
/*
|
|
* Copyright (C) 2004-2006 Atmel Corporation
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
#ifndef __ASM_AVR32_PGALLOC_H
|
|
#define __ASM_AVR32_PGALLOC_H
|
|
|
|
#include <asm/processor.h>
|
|
#include <linux/threads.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/mm.h>
|
|
|
|
#define pmd_populate_kernel(mm, pmd, pte) \
|
|
set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte)))
|
|
|
|
static __inline__ void pmd_populate(struct mm_struct *mm, pmd_t *pmd,
|
|
struct page *pte)
|
|
{
|
|
set_pmd(pmd, __pmd(_PAGE_TABLE + page_to_phys(pte)));
|
|
}
|
|
|
|
/*
|
|
* Allocate and free page tables
|
|
*/
|
|
static __inline__ pgd_t *pgd_alloc(struct mm_struct *mm)
|
|
{
|
|
unsigned int pgd_size = (USER_PTRS_PER_PGD * sizeof(pgd_t));
|
|
pgd_t *pgd = kmalloc(pgd_size, GFP_KERNEL);
|
|
|
|
if (pgd)
|
|
memset(pgd, 0, pgd_size);
|
|
|
|
return pgd;
|
|
}
|
|
|
|
static inline void pgd_free(pgd_t *pgd)
|
|
{
|
|
kfree(pgd);
|
|
}
|
|
|
|
static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
|
|
unsigned long address)
|
|
{
|
|
int count = 0;
|
|
pte_t *pte;
|
|
|
|
do {
|
|
pte = (pte_t *) __get_free_page(GFP_KERNEL | __GFP_REPEAT);
|
|
if (pte)
|
|
clear_page(pte);
|
|
else {
|
|
current->state = TASK_UNINTERRUPTIBLE;
|
|
schedule_timeout(HZ);
|
|
}
|
|
} while (!pte && (count++ < 10));
|
|
|
|
return pte;
|
|
}
|
|
|
|
static inline struct page *pte_alloc_one(struct mm_struct *mm,
|
|
unsigned long address)
|
|
{
|
|
int count = 0;
|
|
struct page *pte;
|
|
|
|
do {
|
|
pte = alloc_pages(GFP_KERNEL, 0);
|
|
if (pte)
|
|
clear_page(page_address(pte));
|
|
else {
|
|
current->state = TASK_UNINTERRUPTIBLE;
|
|
schedule_timeout(HZ);
|
|
}
|
|
} while (!pte && (count++ < 10));
|
|
|
|
return pte;
|
|
}
|
|
|
|
static inline void pte_free_kernel(pte_t *pte)
|
|
{
|
|
free_page((unsigned long)pte);
|
|
}
|
|
|
|
static inline void pte_free(struct page *pte)
|
|
{
|
|
__free_page(pte);
|
|
}
|
|
|
|
#define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte))
|
|
|
|
#define check_pgt_cache() do { } while(0)
|
|
|
|
#endif /* __ASM_AVR32_PGALLOC_H */
|