Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f018c7e1 authored by Roland Dreier's avatar Roland Dreier
Browse files

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: default avatarRoland Dreier <rolandd@cisco.com>
parent 40d97692

drivers/infiniband/hw/ipath/ipath_driver.c

+1 −1
Original line number Diff line number Diff line
@@ -1894,7 +1894,7 @@ void ipath_cancel_sends(struct ipath_devdata *dd, int restore_sendctrl) 
	 */

	if (dd->ipath_flags & IPATH_HAS_SEND_DMA) {

		int skip_cancel;

		u64 *statp = &dd->ipath_sdma_status;

		unsigned long *statp = &dd->ipath_sdma_status;



		spin_lock_irqsave(&dd->ipath_sdma_lock, flags);

		skip_cancel =

drivers/infiniband/hw/ipath/ipath_kernel.h

+3 −3
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ struct ipath_devdata { 


	/* SendDMA related entries */

	spinlock_t            ipath_sdma_lock;

	u64                   ipath_sdma_status;

	unsigned long         ipath_sdma_status;

	unsigned long         ipath_sdma_abort_jiffies;

	unsigned long         ipath_sdma_abort_intr_timeout;

	unsigned long         ipath_sdma_buf_jiffies;
@@ -822,8 +822,8 @@ struct ipath_devdata { 
#define IPATH_SDMA_DISARMED  1

#define IPATH_SDMA_DISABLED  2

#define IPATH_SDMA_LAYERBUF  3

#define IPATH_SDMA_RUNNING  62

#define IPATH_SDMA_SHUTDOWN 63

#define IPATH_SDMA_RUNNING  30

#define IPATH_SDMA_SHUTDOWN 31



/* bit combinations that correspond to abort states */

#define IPATH_SDMA_ABORT_NONE 0