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
Merge branch 'hid-suspend' into picolcd
[pandora-kernel.git]
/
arch
/
sparc
/
mm
/
sun4c.c
diff --git
a/arch/sparc/mm/sun4c.c
b/arch/sparc/mm/sun4c.c
index
a89baf0
..
cf38846
100644
(file)
--- a/
arch/sparc/mm/sun4c.c
+++ b/
arch/sparc/mm/sun4c.c
@@
-12,6
+12,7
@@
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/init.h>
+#include <linux/slab.h>
#include <linux/bootmem.h>
#include <linux/highmem.h>
#include <linux/fs.h>
#include <linux/bootmem.h>
#include <linux/highmem.h>
#include <linux/fs.h>
@@
-1887,7
+1888,7
@@
static void sun4c_check_pgt_cache(int low, int high)
/* An experiment, turn off by default for now... -DaveM */
#define SUN4C_PRELOAD_PSEG
/* An experiment, turn off by default for now... -DaveM */
#define SUN4C_PRELOAD_PSEG
-void sun4c_update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t
pte
)
+void sun4c_update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t
*ptep
)
{
unsigned long flags;
int pseg;
{
unsigned long flags;
int pseg;
@@
-1929,7
+1930,7
@@
void sun4c_update_mmu_cache(struct vm_area_struct *vma, unsigned long address, p
start += PAGE_SIZE;
}
#ifndef SUN4C_PRELOAD_PSEG
start += PAGE_SIZE;
}
#ifndef SUN4C_PRELOAD_PSEG
- sun4c_put_pte(address, pte_val(
pte
));
+ sun4c_put_pte(address, pte_val(
*ptep
));
#endif
local_irq_restore(flags);
return;
#endif
local_irq_restore(flags);
return;
@@
-1940,7
+1941,7
@@
void sun4c_update_mmu_cache(struct vm_area_struct *vma, unsigned long address, p
add_lru(entry);
}
add_lru(entry);
}
- sun4c_put_pte(address, pte_val(
pte
));
+ sun4c_put_pte(address, pte_val(
*ptep
));
local_irq_restore(flags);
}
local_irq_restore(flags);
}