diff options
| author | Pavel Roskin <proski@gnu.org> | 2006-08-15 20:45:00 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-29 17:06:29 -0400 |
| commit | 821fe6831c02259ea0e8c2dec56173bd6037f900 (patch) | |
| tree | b805af8b7c0bedf5effae7991941642b21bbf8e5 /drivers/net/wireless/orinoco.h | |
| parent | fb67a0f7b76647ab5ad1e2512275f672584bb4c3 (diff) | |
| download | linux-stable-821fe6831c02259ea0e8c2dec56173bd6037f900.tar.gz linux-stable-821fe6831c02259ea0e8c2dec56173bd6037f900.tar.bz2 linux-stable-821fe6831c02259ea0e8c2dec56173bd6037f900.zip | |
[PATCH] orinoco: Don't use "extern inline" on locking functions
SPARC architecture has been fixed, so it's no longer needed.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/orinoco.h')
| -rw-r--r-- | drivers/net/wireless/orinoco.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/orinoco.h b/drivers/net/wireless/orinoco.h index 16db3e14b7d2..fb5700d6c454 100644 --- a/drivers/net/wireless/orinoco.h +++ b/drivers/net/wireless/orinoco.h @@ -134,11 +134,7 @@ extern irqreturn_t orinoco_interrupt(int irq, void * dev_id, struct pt_regs *reg /* Locking and synchronization functions */ /********************************************************************/ -/* These functions *must* be inline or they will break horribly on - * SPARC, due to its weird semantics for save/restore flags. extern - * inline should prevent the kernel from linking or module from - * loading if they are not inlined. */ -extern inline int orinoco_lock(struct orinoco_private *priv, +static inline int orinoco_lock(struct orinoco_private *priv, unsigned long *flags) { spin_lock_irqsave(&priv->lock, *flags); @@ -151,7 +147,7 @@ extern inline int orinoco_lock(struct orinoco_private *priv, return 0; } -extern inline void orinoco_unlock(struct orinoco_private *priv, +static inline void orinoco_unlock(struct orinoco_private *priv, unsigned long *flags) { spin_unlock_irqrestore(&priv->lock, *flags); |