diff options
Diffstat (limited to 'arch/sparc/ap1000/msc.c')
| -rw-r--r-- | arch/sparc/ap1000/msc.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/sparc/ap1000/msc.c b/arch/sparc/ap1000/msc.c index fc8aaf6e5..92c1f2eeb 100644 --- a/arch/sparc/ap1000/msc.c +++ b/arch/sparc/ap1000/msc.c @@ -10,7 +10,6 @@ * and Memory Controller (MC+). * */ -#include <linux/config.h> #define _APLIB_ #include <asm/ap1000/apreg.h> #include <linux/mm.h> @@ -237,7 +236,7 @@ void ap_msc_init(void) MSC_OUT(MSC_SQRAM + i * 8, -1); if (!qof_base) { - qof_base = (struct qof_elt *) __get_free_pages(GFP_ATOMIC, QOF_ORDER, 0); + qof_base = (struct qof_elt *) __get_free_pages(GFP_ATOMIC, QOF_ORDER); for (i = MAP_NR(qof_base); i <= MAP_NR(((char*)qof_base)+QOF_SIZE-1);++i) set_bit(PG_reserved, &mem_map[i].flags); } @@ -285,7 +284,7 @@ void ap_msc_init(void) if (!system_ringbuf.ringbuf) { system_ringbuf.ringbuf = - (void *)__get_free_pages(GFP_ATOMIC,SYSTEM_RINGBUF_ORDER,0); + (void *)__get_free_pages(GFP_ATOMIC,SYSTEM_RINGBUF_ORDER); for (i=MAP_NR(system_ringbuf.ringbuf); i<=MAP_NR(system_ringbuf.ringbuf+SYSTEM_RINGBUF_SIZE-1);i++) set_bit(PG_reserved, &mem_map[i].flags); @@ -294,7 +293,7 @@ void ap_msc_init(void) if (!dummy_ringbuf.ringbuf) { dummy_ringbuf.ringbuf = - (void *)__get_free_pages(GFP_ATOMIC,DUMMY_RINGBUF_ORDER,0); + (void *)__get_free_pages(GFP_ATOMIC,DUMMY_RINGBUF_ORDER); for (i=MAP_NR(dummy_ringbuf.ringbuf); i<=MAP_NR(dummy_ringbuf.ringbuf+DUMMY_RINGBUF_SIZE-1);i++) set_bit(PG_reserved, &mem_map[i].flags); @@ -338,7 +337,7 @@ static inline void qbmful_interrupt(void) #endif MSC_OUT(MSC_INTR, AP_SET_INTR_MASK << MSC_INTR_QBMFUL_SH); intr_mask |= (AP_INTR_REQ << MSC_INTR_QBMFUL_SH); - resched_force(); + need_resched = 1; block_parallel_tasks = 1; mark_bh(TQUEUE_BH); } |