diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-21 22:40:05 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-21 22:40:05 -0500 |
| commit | 240d3b54e3a8a8d469f0ff6deacf52f4b751f55a (patch) | |
| tree | fda052cb167f335148028712d0c3b73fb470b562 /include | |
| parent | a6dbb1ef2fc8d73578eacd02ac701f4233175c9f (diff) | |
| parent | 06675e6f4fb00a63575f4b85da305c3ab19e6e5d (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
tc35815: Use irq number for tc35815-mac platform device id
[MIPS] Malta: Fix reading the PCI clock frequency on big-endian
[MIPS] SMTC: Fix build error.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/smtc_ipi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-mips/smtc_ipi.h b/include/asm-mips/smtc_ipi.h index e09131a6127d..8ce517574340 100644 --- a/include/asm-mips/smtc_ipi.h +++ b/include/asm-mips/smtc_ipi.h | |||
| @@ -49,7 +49,7 @@ struct smtc_ipi_q { | |||
| 49 | 49 | ||
| 50 | static inline void smtc_ipi_nq(struct smtc_ipi_q *q, struct smtc_ipi *p) | 50 | static inline void smtc_ipi_nq(struct smtc_ipi_q *q, struct smtc_ipi *p) |
| 51 | { | 51 | { |
| 52 | long flags; | 52 | unsigned long flags; |
| 53 | 53 | ||
| 54 | spin_lock_irqsave(&q->lock, flags); | 54 | spin_lock_irqsave(&q->lock, flags); |
| 55 | if (q->head == NULL) | 55 | if (q->head == NULL) |
| @@ -98,7 +98,7 @@ static inline struct smtc_ipi *smtc_ipi_dq(struct smtc_ipi_q *q) | |||
| 98 | 98 | ||
| 99 | static inline void smtc_ipi_req(struct smtc_ipi_q *q, struct smtc_ipi *p) | 99 | static inline void smtc_ipi_req(struct smtc_ipi_q *q, struct smtc_ipi *p) |
| 100 | { | 100 | { |
| 101 | long flags; | 101 | unsigned long flags; |
| 102 | 102 | ||
| 103 | spin_lock_irqsave(&q->lock, flags); | 103 | spin_lock_irqsave(&q->lock, flags); |
| 104 | if (q->head == NULL) { | 104 | if (q->head == NULL) { |
| @@ -114,7 +114,7 @@ static inline void smtc_ipi_req(struct smtc_ipi_q *q, struct smtc_ipi *p) | |||
| 114 | 114 | ||
| 115 | static inline int smtc_ipi_qdepth(struct smtc_ipi_q *q) | 115 | static inline int smtc_ipi_qdepth(struct smtc_ipi_q *q) |
| 116 | { | 116 | { |
| 117 | long flags; | 117 | unsigned long flags; |
| 118 | int retval; | 118 | int retval; |
| 119 | 119 | ||
| 120 | spin_lock_irqsave(&q->lock, flags); | 120 | spin_lock_irqsave(&q->lock, flags); |