Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

[powerpc.git] / arch / avr32 / mm / tlb.c

diff --git a/arch/avr32/mm/tlb.c b/arch/avr32/mm/tlb.c
index 5d0523b..5667201 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)
 {
-       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);
@@ -305,7 +306,8 @@ static void tlb_stop(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)
@@ -358,7 +360,7 @@ static int tlb_open(struct inode *inode, struct file *file)
        return seq_open(file, &tlb_ops);
 }
 
-static struct file_operations proc_tlb_operations = {
+static const struct file_operations proc_tlb_operations = {
        .open           = tlb_open,
        .read           = seq_read,
        .llseek         = seq_lseek,