Commit 3841da91 authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds

[PATCH] m68k: atari updates [2/20]

Some compile fixes.
parent 60ee061e
......@@ -169,7 +169,7 @@ asmlinkage void IRQ_NAME(n); \
void atari_slow_irq_##n##_dummy (void) { \
__asm__ (__ALIGN_STR "\n" \
"atari_slow_irq_" #n "_handler:\t" \
" addql #1,irq_stat+8\n" /* local_irq_count */ \
" addql #1,%5\n" /* local_irq_count++ */ \
SAVE_ALL_INT "\n" \
GET_CURRENT(%%d0) "\n" \
" andb #~(1<<(%c3&7)),%a4:w\n" /* mask this interrupt */ \
......@@ -194,8 +194,10 @@ __asm__ (__ALIGN_STR "\n" \
: : "i" (&kstat.irqs[0][n+8]), "i" (&irq_handler[n+8]), \
"n" (PT_OFF_SR), "n" (n), \
"i" (n & 8 ? (n & 16 ? &tt_mfp.int_mk_a : &mfp.int_mk_a) \
: (n & 16 ? &tt_mfp.int_mk_b : &mfp.int_mk_b)) \
: (n & 16 ? &tt_mfp.int_mk_b : &mfp.int_mk_b)), \
"m" (local_irq_count(0)) \
); \
for (;;); /* fake noreturn */ \
}
BUILD_SLOW_IRQ(0);
......@@ -275,7 +277,7 @@ __asm__ (__ALIGN_STR "\n"
"atari_fast_irq_handler:
orw #0x700,%%sr /* disable all interrupts */
atari_prio_irq_handler:\t
addql #1,irq_stat+8\n" /* local_irq_count */
addql #1,%2\n" /* local_irq_count++ */
SAVE_ALL_INT "\n"
GET_CURRENT(%%d0) "
/* get vector number from stack frame and convert to source */
......@@ -295,8 +297,10 @@ atari_prio_irq_handler:\t
addql #8,%%sp
addql #4,%%sp
jbra ret_from_interrupt"
: : "i" (&kstat.irqs[0]), "n" (PT_OFF_FORMATVEC)
: : "i" (&kstat.irqs[0]), "n" (PT_OFF_FORMATVEC),
"m" (local_irq_count(0))
);
for (;;);
}
/* GK:
......
......@@ -258,7 +258,9 @@ void __init config_atari(void)
mach_keyb_init = atari_keyb_init;
mach_kbdrate = atari_kbdrate;
mach_kbd_translate = atari_kbd_translate;
#ifdef CONFIG_MAGIC_SYSRQ
SYSRQ_KEY = 0xff;
#endif
mach_kbd_leds = atari_kbd_leds;
mach_init_IRQ = atari_init_IRQ;
mach_request_irq = atari_request_irq;
......
......@@ -236,8 +236,8 @@ static unsigned long find_free_region( unsigned long n_pages, unsigned long
static void do_stram_request(request_queue_t *);
static int stram_open( struct inode *inode, struct file *filp );
static int stram_release( struct inode *inode, struct file *filp );
#endif
static void reserve_region(void *start, void *end);
#endif
static BLOCK *add_region( void *addr, unsigned long size );
static BLOCK *find_region( void *addr );
static int remove_region( BLOCK *block );
......@@ -296,7 +296,7 @@ void __init atari_stram_reserve_pages(void *start_mem)
max_swap_size =
(!MACH_IS_HADES &&
(N_PAGES(stram_end-stram_start)*MAX_STRAM_FRACTION_DENOM <=
(high_memory>>PAGE_SHIFT)*MAX_STRAM_FRACTION_NOM)) ? 16*1024*1024 : 0;
((unsigned long)high_memory>>PAGE_SHIFT)*MAX_STRAM_FRACTION_NOM)) ? 16*1024*1024 : 0;
DPRINTK( "atari_stram_reserve_pages: max_swap_size = %d\n", max_swap_size );
#endif
......@@ -660,7 +660,7 @@ static inline void unswap_pmd(struct vm_area_struct * vma, pmd_t *dir,
pmd_clear(dir);
return;
}
pte = pte_offset(dir, address);
pte = pte_offset_kernel(dir, address);
offset += address & PMD_MASK;
address &= ~PMD_MASK;
end = address + size;
......@@ -759,7 +759,7 @@ static int unswap_by_read(unsigned short *map, unsigned long max,
/* Get a page for the entry, using the existing
swap cache page if there is one. Otherwise,
get a clean page and read the swap into it. */
page = read_swap_cache(entry);
page = read_swap_cache_async(entry);
if (!page) {
swap_free(entry);
return -ENOMEM;
......@@ -768,7 +768,7 @@ static int unswap_by_read(unsigned short *map, unsigned long max,
for_each_task(p)
unswap_process(p->mm, entry, page);
read_unlock(&tasklist_lock);
shm_unuse(entry, page);
shmem_unuse(entry, page);
/* Now get rid of the extra reference to the
temporary page we've been using. */
if (PageSwapCache(page))
......@@ -1069,7 +1069,6 @@ int __init stram_device_init(void)
return( 0 );
}
#endif /* CONFIG_STRAM_SWAP */
/* ------------------------------------------------------------------------ */
......@@ -1082,6 +1081,7 @@ static void reserve_region(void *start, void *end)
reserve_bootmem (virt_to_phys(start), end - start);
}
#endif /* CONFIG_STRAM_SWAP */
/* ------------------------------------------------------------------------ */
......
......@@ -2764,22 +2764,6 @@ LSCC_DATA = 0xff8c87
LSCC_CTRL = 0xff8c81
LSCC_DATA = 0xff8c83
/* Initialisation table for SCC */
L(scc_initable):
.byte 9,12 /* Reset */
.byte 4,0x44 /* x16, 1 stopbit, no parity */
.byte 3,0xc0 /* receiver: 8 bpc */
.byte 5,0xe2 /* transmitter: 8 bpc, assert dtr/rts */
.byte 9,0 /* no interrupts */
.byte 10,0 /* NRZ */
.byte 11,0x50 /* use baud rate generator */
.byte 12,24,13,0 /* 9600 baud */
.byte 14,2,14,3 /* use master clock for BRG, enable */
.byte 3,0xc1 /* enable receiver */
.byte 5,0xea /* enable transmitter */
.byte -1
.even
#elif defined(USE_MFP)
LMFP_UCR = 0xfffa29
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment