Those header files are not used at all anymore, only relics from a long gone time, so drop them.
Signed-off-by: Lars-Peter Clausen <[email protected]> --- arch/lm32/include/asm/bootinfo.h | 2 - arch/lm32/include/asm/irqnode.h | 59 ------------- arch/lm32/include/asm/namei.h | 20 ----- arch/lm32/include/asm/page_offset.h | 1 - arch/lm32/include/asm/semaphore-helper.h | 85 ------------------- arch/lm32/include/asm/semaphore.h | 131 ------------------------------ arch/lm32/kernel/asm-offsets.c | 2 - 7 files changed, 0 insertions(+), 300 deletions(-) delete mode 100644 arch/lm32/include/asm/bootinfo.h delete mode 100644 arch/lm32/include/asm/irqnode.h delete mode 100644 arch/lm32/include/asm/namei.h delete mode 100644 arch/lm32/include/asm/page_offset.h delete mode 100644 arch/lm32/include/asm/semaphore-helper.h delete mode 100644 arch/lm32/include/asm/semaphore.h diff --git a/arch/lm32/include/asm/bootinfo.h b/arch/lm32/include/asm/bootinfo.h deleted file mode 100644 index 35c9c30..0000000 --- a/arch/lm32/include/asm/bootinfo.h +++ /dev/null @@ -1,2 +0,0 @@ -/* keep me */ - diff --git a/arch/lm32/include/asm/irqnode.h b/arch/lm32/include/asm/irqnode.h deleted file mode 100644 index 40c400c..0000000 --- a/arch/lm32/include/asm/irqnode.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * (C) Copyright 2007 - * Theobroma Systems <www.theobroma-systems.com> - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#ifndef _LM32_ASM_IRQNODE_H -#define _LM32_ASM_IRQNODE_H - -#include <linux/interrupt.h> - -/* - * This structure is used to chain together the ISRs for a particular - * interrupt source (if it supports chaining). - */ -typedef struct irq_node { - irq_handler_t handler; - unsigned long flags; - void *dev_id; - const char *devname; - struct irq_node *next; -} irq_node_t; - -/* - * This structure has only 4 elements for speed reasons - */ -struct irq_entry { - irq_handler_t handler; - unsigned long flags; - void *dev_id; - const char *devname; -}; - -/* count of spurious interrupts */ -extern volatile unsigned int num_spurious; - -/* - * This function returns a new irq_node_t - */ -extern irq_node_t *new_irq_node(void); - -#endif /* _LM32_ASM_IRQNODE_H */ diff --git a/arch/lm32/include/asm/namei.h b/arch/lm32/include/asm/namei.h deleted file mode 100644 index 281546e4..0000000 --- a/arch/lm32/include/asm/namei.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Based on: - * include/asm-blackfin/namei.h - * - * Included from linux/fs/namei.c - * - * Changes made by Lineo Inc. May 2001 - */ - -#ifndef _ASM_LM32_NAMEI_H -#define _ASM_LM32_NAMEI_H - -/* This dummy routine maybe changed to something useful - * for /usr/gnemul/ emulation stuff. - * Look at asm-sparc/namei.h for details. - */ - -#define __emul_prefix() NULL - -#endif diff --git a/arch/lm32/include/asm/page_offset.h b/arch/lm32/include/asm/page_offset.h deleted file mode 100644 index 049df6b..0000000 --- a/arch/lm32/include/asm/page_offset.h +++ /dev/null @@ -1 +0,0 @@ -#define PAGE_OFFSET_RAW 0x00000000 diff --git a/arch/lm32/include/asm/semaphore-helper.h b/arch/lm32/include/asm/semaphore-helper.h deleted file mode 100644 index a12562c..0000000 --- a/arch/lm32/include/asm/semaphore-helper.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Based on: - * include/asm-blackfin/semaphore-helper.h - * - * Based on M68K version, Lineo Inc. May 2001 - * - * SMP- and interrupt-safe semaphores helper functions. - * - * (C) Copyright 1996 Linus Torvalds - * - */ - -#ifndef _ASM_LM32_SEMAPHORE_HELPER_H -#define _ASM_LM32_SEMAPHORE_HELPER_H - -#include <asm/errno.h> - -/* - * These two _must_ execute atomically wrt each other. - */ -static inline void wake_one_more(struct semaphore *sem) -{ - atomic_inc(&sem->waking); -} - -static inline int waking_non_zero(struct semaphore *sem) -{ - int ret; - unsigned long flags = 0; - - spin_lock_irqsave(&semaphore_wake_lock, flags); - ret = 0; - if (atomic_read(&sem->waking) > 0) { - atomic_dec(&sem->waking); - ret = 1; - } - spin_unlock_irqrestore(&semaphore_wake_lock, flags); - return ret; -} - -/* - * waking_non_zero_interruptible: - * 1 got the lock - * 0 go to sleep - * -EINTR interrupted - */ -static inline int waking_non_zero_interruptible(struct semaphore *sem, - struct task_struct *tsk) -{ - int ret = 0; - unsigned long flags = 0; - - spin_lock_irqsave(&semaphore_wake_lock, flags); - if (atomic_read(&sem->waking) > 0) { - atomic_dec(&sem->waking); - ret = 1; - } else if (signal_pending(tsk)) { - atomic_inc(&sem->count); - ret = -EINTR; - } - spin_unlock_irqrestore(&semaphore_wake_lock, flags); - return ret; -} - -/* - * waking_non_zero_trylock: - * 1 failed to lock - * 0 got the lock - */ -static inline int waking_non_zero_trylock(struct semaphore *sem) -{ - int ret = 1; - unsigned long flags = 0; - - spin_lock_irqsave(&semaphore_wake_lock, flags); - if (atomic_read(&sem->waking) > 0) { - atomic_dec(&sem->waking); - ret = 0; - } else - atomic_inc(&sem->count); - spin_unlock_irqrestore(&semaphore_wake_lock, flags); - return ret; -} - -#endif diff --git a/arch/lm32/include/asm/semaphore.h b/arch/lm32/include/asm/semaphore.h deleted file mode 100644 index 7b5c6a1..0000000 --- a/arch/lm32/include/asm/semaphore.h +++ /dev/null @@ -1,131 +0,0 @@ -/* - * (C) Copyright 2007 - * Theobroma Systems <www.theobroma-systems.com> - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ -/* - * Based on - * include/asm-v850/semaphore.h - * include/asm-m68k/semaphore.h - * - * Interrupt-safe semaphores.. - * - * (C) Copyright 1996 Linus Torvalds - */ - - -#ifndef __ASM_LM32_SEMAPHORE_H -#define __ASM_LM32_SEMAPHORE_H - -#ifndef __ASSEMBLY__ - -#include <linux/linkage.h> -#include <linux/wait.h> -#include <linux/spinlock.h> -#include <linux/rwsem.h> -#include <asm/atomic.h> - -struct semaphore { - atomic_t count; - atomic_t waking; - int sleepers; - wait_queue_head_t wait; -}; - -#define __SEMAPHORE_INITIALIZER(name, n) \ -{ \ - .count = ATOMIC_INIT(n), \ - .sleepers = 0, \ - .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ -} - -#define __DECLARE_SEMAPHORE_GENERIC(name,count) \ - struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) - -#define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) -#define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) - -static inline void sema_init(struct semaphore *sem, int val) -{ - *sem = (struct semaphore)__SEMAPHORE_INITIALIZER(*sem, val); -} - -static inline void init_MUTEX(struct semaphore *sem) -{ - sema_init(sem, 1); -} - -static inline void init_MUTEX_LOCKED(struct semaphore *sem) -{ - sema_init(sem, 0); -} - -asmlinkage void __down(struct semaphore *sem); -asmlinkage int __down_interruptible(struct semaphore *sem); -asmlinkage int __down_trylock(struct semaphore *sem); -asmlinkage void __up(struct semaphore *sem); - -extern spinlock_t semaphore_wake_lock; - -/* - * This is ugly, but we want the default case to fall through. - * "down_failed" is a special asm handler that calls the C - * routine that actually waits. - */ -static inline void down(struct semaphore *sem) -{ - might_sleep(); - if (atomic_dec_return(&sem->count) < 0) - __down(sem); -} - -static inline int down_interruptible(struct semaphore *sem) -{ - int ret = 0; - - might_sleep(); - if (atomic_dec_return(&sem->count) < 0) - ret = __down_interruptible(sem); - return (ret); -} - -static inline int down_trylock(struct semaphore *sem) -{ - int ret = 0; - - if (atomic_dec_return(&sem->count) < 0) - ret = __down_trylock(sem); - return ret; -} - -/* - * Note! This is subtle. We jump to wake people up only if - * the semaphore was negative (== somebody was waiting on it). - * The default case (no contention) will result in NO - * jumps for both down() and up(). - */ -static inline void up(struct semaphore *sem) -{ - if (atomic_inc_return(&sem->count) <= 0) - __up(sem); -} - -#endif /* __ASSEMBLY__ */ -#endif diff --git a/arch/lm32/kernel/asm-offsets.c b/arch/lm32/kernel/asm-offsets.c index e3999a1..a464feb 100644 --- a/arch/lm32/kernel/asm-offsets.c +++ b/arch/lm32/kernel/asm-offsets.c @@ -42,9 +42,7 @@ #include <linux/kernel_stat.h> #include <linux/ptrace.h> #include <linux/hardirq.h> -#include <asm/bootinfo.h> #include <asm/irq.h> -#include <asm/irqnode.h> #include <asm/thread_info.h> #define DEFINE(sym, val) \ -- 1.7.2.3 _______________________________________________ http://lists.milkymist.org/listinfo.cgi/devel-milkymist.org IRC: #milkymist@Freenode Twitter: www.twitter.com/milkymistvj Ideas? http://milkymist.uservoice.com
