IB/ipath: Change ipath_devdata.ipath_sdma_status to be unsigned long

Andrew Morton <akpm@linux-foundation.org> pointed out that bitops
should take an unsigned long * arg. However, the ipath driver was
doing bitops on struct ipath_devdata.ipath_sdma_status, which is u64.
Change this member to unsigned long to avoid tons of warnings when x86
fixes the bitops to take unsigned long * instead of void *.

Also, change the IPATH_SDMA_RUNNING and IPATH_SDMA_SHUTDOWN bit
numbers to 30 and 31 (instead of 62 and 63) so that we're not setting
another booby trap for someone who tries to make ipath work on a
32-bit architecture.

Signed-off-by: Roland Dreier <rolandd@cisco.com>

+4 -4
+1 -1
drivers/infiniband/hw/ipath/ipath_driver.c
··· 1894 */ 1895 if (dd->ipath_flags & IPATH_HAS_SEND_DMA) { 1896 int skip_cancel; 1897 - u64 *statp = &dd->ipath_sdma_status; 1898 1899 spin_lock_irqsave(&dd->ipath_sdma_lock, flags); 1900 skip_cancel =
··· 1894 */ 1895 if (dd->ipath_flags & IPATH_HAS_SEND_DMA) { 1896 int skip_cancel; 1897 + unsigned long *statp = &dd->ipath_sdma_status; 1898 1899 spin_lock_irqsave(&dd->ipath_sdma_lock, flags); 1900 skip_cancel =
+3 -3
drivers/infiniband/hw/ipath/ipath_kernel.h
··· 483 484 /* SendDMA related entries */ 485 spinlock_t ipath_sdma_lock; 486 - u64 ipath_sdma_status; 487 unsigned long ipath_sdma_abort_jiffies; 488 unsigned long ipath_sdma_abort_intr_timeout; 489 unsigned long ipath_sdma_buf_jiffies; ··· 822 #define IPATH_SDMA_DISARMED 1 823 #define IPATH_SDMA_DISABLED 2 824 #define IPATH_SDMA_LAYERBUF 3 825 - #define IPATH_SDMA_RUNNING 62 826 - #define IPATH_SDMA_SHUTDOWN 63 827 828 /* bit combinations that correspond to abort states */ 829 #define IPATH_SDMA_ABORT_NONE 0
··· 483 484 /* SendDMA related entries */ 485 spinlock_t ipath_sdma_lock; 486 + unsigned long ipath_sdma_status; 487 unsigned long ipath_sdma_abort_jiffies; 488 unsigned long ipath_sdma_abort_intr_timeout; 489 unsigned long ipath_sdma_buf_jiffies; ··· 822 #define IPATH_SDMA_DISARMED 1 823 #define IPATH_SDMA_DISABLED 2 824 #define IPATH_SDMA_LAYERBUF 3 825 + #define IPATH_SDMA_RUNNING 30 826 + #define IPATH_SDMA_SHUTDOWN 31 827 828 /* bit combinations that correspond to abort states */ 829 #define IPATH_SDMA_ABORT_NONE 0