aboutsummaryrefslogtreecommitdiffstats
path: root/arch/frv/kernel/semaphore.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2005-11-28 13:43:51 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-28 14:42:23 -0800
commit8080f231224ccd3169f39e73fd750ba98d5b98a7 (patch)
treee86762b01f248dbf735e786783d3d9eb0e7c9950 /arch/frv/kernel/semaphore.c
parentc13cf856cbe16aec3007604dc013cbf3a16c6686 (diff)
downloadkernel_samsung_smdk4412-8080f231224ccd3169f39e73fd750ba98d5b98a7.zip
kernel_samsung_smdk4412-8080f231224ccd3169f39e73fd750ba98d5b98a7.tar.gz
kernel_samsung_smdk4412-8080f231224ccd3169f39e73fd750ba98d5b98a7.tar.bz2
[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>
Diffstat (limited to 'arch/frv/kernel/semaphore.c')
-rw-r--r--arch/frv/kernel/semaphore.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/kernel/semaphore.c b/arch/frv/kernel/semaphore.c
index 5cba9c1..7971d68 100644
--- a/arch/frv/kernel/semaphore.c
+++ b/arch/frv/kernel/semaphore.c
@@ -20,7 +20,7 @@ struct sem_waiter {
struct task_struct *task;
};
-#if SEM_DEBUG
+#if SEMAPHORE_DEBUG
void semtrace(struct semaphore *sem, const char *str)
{
if (sem->debug)