projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wirel...
[powerpc.git]
/
arch
/
avr32
/
mm
/
tlb.c
diff --git
a/arch/avr32/mm/tlb.c
b/arch/avr32/mm/tlb.c
index
5d0523b
..
7b07305
100644
(file)
--- a/
arch/avr32/mm/tlb.c
+++ b/
arch/avr32/mm/tlb.c
@@
-15,7
+15,8
@@
void show_dtlb_entry(unsigned int index)
{
void show_dtlb_entry(unsigned int index)
{
- unsigned int tlbehi, tlbehi_save, tlbelo, mmucr, mmucr_save, flags;
+ unsigned int tlbehi, tlbehi_save, tlbelo, mmucr, mmucr_save;
+ unsigned long flags;
local_irq_save(flags);
mmucr_save = sysreg_read(MMUCR);
local_irq_save(flags);
mmucr_save = sysreg_read(MMUCR);
@@
-305,7
+306,8
@@
static void tlb_stop(struct seq_file *tlb, void *v)
static int tlb_show(struct seq_file *tlb, void *v)
{
static int tlb_show(struct seq_file *tlb, void *v)
{
- unsigned int tlbehi, tlbehi_save, tlbelo, mmucr, mmucr_save, flags;
+ unsigned int tlbehi, tlbehi_save, tlbelo, mmucr, mmucr_save;
+ unsigned long flags;
unsigned long *index = v;
if (*index == 0)
unsigned long *index = v;
if (*index == 0)