[PATCH] FRV: Make the FRV arch work again

The attached patch implements a bunch of small changes to the FRV arch to
make it work again.

It deals with the following problems:

 (1) SEM_DEBUG should be SEMAPHORE_DEBUG.

 (2) The argument list to pcibios_penalize_isa_irq() has changed.

 (3) CONFIG_HIGHMEM can't be used directly in #if as it may not be defined.

 (4) page->private is no longer directly accessible.

 (5) linux/hardirq.h assumes asm/hardirq.h will include linux/irq.h

 (6) The IDE MMIO access functions are given pointers, not integers, and so
     get type casting errors.

 (7) __pa() is passed an explicit u64 type in drivers/char/mem.c, but that
     can't be cast directly to a pointer on a 32-bit platform.

 (8) SEMAPHORE_DEBUG should not be contingent on WAITQUEUE_DEBUG as that no
     longer exists.

 (9) PREEMPT_ACTIVE is too low a value.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/include/asm-frv/ide.h b/include/asm-frv/ide.h
index f9caecf7e3c0..ae031eaa3dd2 100644
--- a/include/asm-frv/ide.h
+++ b/include/asm-frv/ide.h
@@ -33,10 +33,10 @@
 /*
  * some bits needed for parts of the IDE subsystem to compile
  */
-#define __ide_mm_insw(port, addr, n)    insw(port, addr, n)
-#define __ide_mm_insl(port, addr, n)    insl(port, addr, n)
-#define __ide_mm_outsw(port, addr, n)   outsw(port, addr, n)
-#define __ide_mm_outsl(port, addr, n)   outsl(port, addr, n)
+#define __ide_mm_insw(port, addr, n)    insw((unsigned long) (port), addr, n)
+#define __ide_mm_insl(port, addr, n)    insl((unsigned long) (port), addr, n)
+#define __ide_mm_outsw(port, addr, n)   outsw((unsigned long) (port), addr, n)
+#define __ide_mm_outsl(port, addr, n)   outsl((unsigned long) (port), addr, n)
 
 
 #endif /* __KERNEL__ */