vserver 2.0-rc4

[linux-2.6.git] / arch / m68k / atari / stram.c

diff --git a/arch/m68k/atari/stram.c b/arch/m68k/atari/stram.c
index 65b1b9c..7827053 100644 (file)
--- a/arch/m68k/atari/stram.c
+++ b/arch/m68k/atari/stram.c
@@ -635,7 +635,6 @@ static inline void unswap_pte(struct vm_area_struct * vma, unsigned long
        set_pte(dir, pte_mkdirty(mk_pte(page, vma->vm_page_prot)));
        swap_free(entry);
        get_page(page);
-       // ++vma->vm_mm->rss;
        vx_rsspages_inc(vma->vm_mm);
 }
 
@@ -744,7 +743,7 @@ static int unswap_by_read(unsigned short *map, unsigned long max,
 
                if (map[i]) {
                        entry = swp_entry(stram_swap_type, i);
-                       DPRINTK("unswap: map[i=%lu]=%u nr_swap=%u\n",
+                       DPRINTK("unswap: map[i=%lu]=%u nr_swap=%ld\n",
                                i, map[i], nr_swap_pages);
 
                        swap_device_lock(stram_swap_info);
@@ -773,7 +772,7 @@ static int unswap_by_read(unsigned short *map, unsigned long max,
        #endif
                }
 
-               DPRINTK( "unswap: map[i=%lu]=%u nr_swap=%u\n",
+               DPRINTK( "unswap: map[i=%lu]=%u nr_swap=%ld\n",
                                 i, map[i], nr_swap_pages );
                swap_list_lock();
                swap_device_lock(stram_swap_info);
@@ -1034,7 +1033,7 @@ static struct block_device_operations stram_fops = {
 
 static struct gendisk *stram_disk;
 static struct request_queue *stram_queue;
-static spinlock_t stram_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(stram_lock);
 
 int __init stram_device_init(void)
 {