From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Thu, 6 Apr 2017 07:17:44 +0000 (-0700)
Subject: Merge branch topic/uek-4.1/sparc of git://ca-git.us.oracle.com/linux-uek into uek... 
X-Git-Tag: v4.1.12-98.0.20170517_2143~37
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e694c44fc87a2e8620e1c4e7677a7f6c348769e4;p=users%2Fjedix%2Flinux-maple.git

Merge branch topic/uek-4.1/sparc of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

* topic/uek-4.1/sparc: (28 commits)
  megaraid: Fix unaligned warning
  sparc64: Restrict number of processes
  SPARC64: vds_blk_rw() does not handle drives with q->limits.chunk_sectors > 0
  sparc64: Improve boot time by per cpu map update
  arch/sparc: memblock resizes are not handled properly
  SPARC64: LDOM vnet "Got unexpected MCAST reply"
  ldmvsw: disable tso and gso for bridge operations
  ldmvsw: update and simplify version string
  sunvnet: remove extra rcu_read_unlocks
  sunvnet: straighten up message event handling logic
  sunvnet: add memory barrier before check for tx enable
  sunvnet: update version and version printing
  sunvnet: remove unused variable in maybe_tx_wakeup
  sunvnet: make sunvnet common code dynamically loadable
  hwrng: n2 - update version info
  hwrng: n2 - support new hardware register layout
  hwrng: n2 - add device data descriptions
  hwrng: n2 - limit error spewage when self-test fails
  hwrng: n2 - Attach on T5/M5, T7/M7 SPARC CPUs
  tcp: fix tcp_fastopen unaligned access complaints on sparc
  ...
---

e694c44fc87a2e8620e1c4e7677a7f6c348769e4
diff --cc drivers/scsi/megaraid/megaraid_sas_base.c
index b1c48e59854fb,99195a6312f52..83bf46a974122
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@@ -6704,9 -6179,10 +6705,10 @@@ megasas_mgmt_fw_ioctl(struct megasas_in
  		sense_ptr = (unsigned long *) ((unsigned long)ioc->frame.raw +
  				ioc->sense_off);
  
- 		if (copy_to_user((void __user *)((unsigned long)(*sense_ptr)),
+ 		unsigned long tmp = get_unaligned((unsigned long *) sense_ptr);
+ 		if (copy_to_user((void __user *)((unsigned long)tmp),
  				 sense, ioc->sense_len)) {
 -			printk(KERN_ERR "megasas: Failed to copy out to user "
 +			dev_err(&instance->pdev->dev, "Failed to copy out to user "
  					"sense data\n");
  			error = -EFAULT;
  			goto out;