GIT: wrapfs-4.1.y -- Wrapfs: update copyright year to 2015 (push to branch refs/heads/master)
ezk at fsl.cs.sunysb.edu
ezk at fsl.cs.sunysb.edu
Sun Dec 13 18:52:21 EST 2015
Push to branch refs/heads/master:
9140db768d3d98d9e45f1557b1d710aead6dc319 -->
199f15deb977ee3e4786fd6e25277ee1fe5c12df
Documentation/devicetree/bindings/mfd/mfd.txt | 41 ++
Documentation/filesystems/00-INDEX | 3 +
Documentation/filesystems/proc.txt | 5 +-
Documentation/filesystems/wrapfs.txt | 172 ++++++
MAINTAINERS | 9 +
Makefile | 2 +-
arch/arm/boot/dts/am57xx-beagle-x15.dts | 3 +-
arch/arm/boot/dts/armada-385-db-ap.dts | 2 +-
arch/arm/boot/dts/exynos5420-peach-pit.dts | 5 +
arch/arm/boot/dts/exynos5800-peach-pi.dts | 5 +
arch/arm/boot/dts/imx27.dtsi | 16 +-
arch/arm/boot/dts/imx6dl-riotboard.dts | 8 +-
arch/arm/boot/dts/imx6q-arm2.dts | 5 +-
arch/arm/boot/dts/imx6q-gk802.dts | 3 +-
arch/arm/boot/dts/imx6q-tbs2910.dts | 4 +-
arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 4 +-
arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 4 +-
arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 3 +-
arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 4 +-
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 8 +-
arch/arm/boot/dts/imx6qdl-rex.dtsi | 4 +-
arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 4 +-
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 6 +-
arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 8 +-
arch/arm/boot/dts/imx6qdl-tx6.dtsi | 4 +-
arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 6 +-
arch/arm/boot/dts/imx6sl-evk.dts | 10 +-
arch/arm/boot/dts/imx6sx-sabreauto.dts | 4 +-
arch/arm/boot/dts/imx6sx-sdb.dtsi | 4 +-
arch/arm/boot/dts/omap5-uevm.dts | 66 ++-
arch/arm/boot/dts/sama5d4.dtsi | 8 +-
arch/arm/boot/dts/sun7i-a20.dtsi | 2 +-
arch/arm/common/edma.c | 6 +-
arch/arm/kvm/Kconfig | 1 +
arch/arm/mach-at91/pm_suspend.S | 2 +
arch/arm/mach-pxa/include/mach/pxa27x.h | 2 +-
arch/arm/mach-pxa/pxa27x.c | 2 +-
arch/arm/mach-tegra/board-paz00.c | 4 +-
arch/arm/mm/dma-mapping.c | 7 +
arch/arm/plat-orion/common.c | 2 +-
arch/arm/vdso/vdsomunge.c | 17 +-
arch/arm64/include/asm/cpuidle.h | 8 +-
arch/arm64/include/asm/ptrace.h | 16 +-
arch/arm64/include/asm/suspend.h | 2 +-
arch/arm64/kernel/armv8_deprecated.c | 18 +-
arch/arm64/kernel/cpuidle.c | 4 +-
arch/arm64/kernel/psci.c | 2 +-
arch/arm64/kernel/stacktrace.c | 6 +-
arch/arm64/kernel/suspend.c | 26 +-
arch/arm64/kernel/vmlinux.lds.S | 5 +-
arch/mips/kvm/emulate.c | 2 +-
arch/mips/kvm/locore.S | 16 +-
arch/mips/kvm/mips.c | 5 +-
arch/mips/lantiq/clk.c | 17 +
arch/powerpc/kernel/rtas.c | 3 +
arch/s390/kvm/interrupt.c | 7 +-
arch/s390/kvm/kvm-s390.c | 10 +-
arch/s390/kvm/sigp.c | 8 +-
arch/x86/boot/compressed/eboot.c | 8 +-
arch/x86/include/uapi/asm/svm.h | 1 +
arch/x86/kernel/cpu/common.c | 3 +-
arch/x86/kernel/head_64.S | 8 +
arch/x86/kernel/setup.c | 8 +
arch/x86/kernel/verify_cpu.S | 12 +-
arch/x86/kvm/lapic.c | 2 +
arch/x86/kvm/svm.c | 8 +
arch/x86/kvm/vmx.c | 5 +-
arch/x86/xen/enlighten.c | 6 +-
crypto/ablkcipher.c | 2 +-
crypto/algapi.c | 2 +-
crypto/api.c | 6 +-
crypto/crypto_user.c | 2 +-
drivers/block/nvme-core.c | 9 +-
drivers/block/rbd.c | 71 +--
drivers/block/xen-blkfront.c | 3 +-
drivers/bluetooth/ath3k.c | 4 +
drivers/bluetooth/btusb.c | 2 +
drivers/clk/versatile/clk-icst.c | 4 +-
drivers/cpufreq/intel_pstate.c | 5 +
drivers/edac/sb_edac.c | 8 +-
drivers/gpu/drm/drm_dp_mst_topology.c | 7 +-
drivers/gpu/drm/i915/i915_gem_userptr.c | 5 +-
drivers/gpu/drm/i915/intel_display.c | 7 +
drivers/gpu/drm/i915/intel_lrc.c | 1 +
drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +
drivers/gpu/drm/nouveau/nouveau_gem.c | 5 +-
drivers/gpu/drm/radeon/atombios_encoders.c | 19 +-
drivers/gpu/drm/radeon/radeon.h | 1 +
drivers/gpu/drm/radeon/radeon_encoders.c | 1 -
drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 1 +
drivers/gpu/drm/radeon/radeon_pm.c | 43 +-
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 3 +
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 6 +-
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 6 +-
drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 29 +-
drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 12 +-
drivers/i2c/busses/i2c-mv64xxx.c | 2 -
drivers/iio/accel/st_accel_core.c | 6 -
drivers/infiniband/core/cm.c | 10 +-
drivers/input/mouse/alps.c | 48 +-
drivers/iommu/amd_iommu.c | 4 +-
drivers/iommu/amd_iommu_types.h | 1 +
drivers/iommu/amd_iommu_v2.c | 7 +
drivers/iommu/intel-iommu.c | 12 +-
drivers/irqchip/irq-tegra.c | 1 +
drivers/md/md.c | 3 +-
drivers/md/persistent-data/dm-btree-remove.c | 17 +-
drivers/md/persistent-data/dm-btree.c | 2 +-
drivers/md/raid1.c | 2 +-
drivers/md/raid10.c | 2 +-
drivers/md/raid5.c | 6 +-
drivers/media/dvb-frontends/si2168.c | 4 +
drivers/media/tuners/si2157.c | 4 +
drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 15 +-
drivers/media/usb/dvb-usb-v2/rtl28xxu.h | 2 +-
drivers/mfd/twl6040.c | 2 +
drivers/net/can/dev.c | 2 +-
drivers/net/can/sja1000/sja1000.c | 3 +
drivers/net/ethernet/marvell/mvneta.c | 2 +-
drivers/net/ethernet/mellanox/mlx4/cmd.c | 2 +-
drivers/net/ethernet/mellanox/mlx4/eq.c | 2 +-
drivers/net/ethernet/sfc/ef10.c | 4 +-
drivers/net/ethernet/sfc/farch.c | 4 +-
drivers/net/ethernet/sfc/net_driver.h | 2 +
drivers/net/ethernet/sfc/tx.c | 30 +-
.../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 7 +-
drivers/net/macvtap.c | 2 +-
drivers/net/ppp/pppoe.c | 2 +-
drivers/net/usb/qmi_wwan.c | 4 +
drivers/net/virtio_net.c | 4 +-
drivers/net/wireless/ath/ath10k/mac.c | 2 +-
drivers/net/wireless/ath/ath9k/init.c | 1 +
drivers/net/wireless/iwlwifi/dvm/lib.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-7000.c | 2 +-
drivers/net/wireless/iwlwifi/mvm/d3.c | 12 +-
drivers/net/wireless/iwlwifi/mvm/fw.c | 4 +-
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 1 +
drivers/net/wireless/iwlwifi/mvm/mvm.h | 5 +
drivers/net/wireless/iwlwifi/mvm/ops.c | 1 +
drivers/net/wireless/iwlwifi/pcie/drv.c | 24 +-
drivers/net/wireless/iwlwifi/pcie/trans.c | 10 +-
drivers/net/wireless/mwifiex/debugfs.c | 14 +-
drivers/net/wireless/rtlwifi/pci.h | 2 +
drivers/net/wireless/rtlwifi/rtl8821ae/hw.c | 17 +
drivers/net/wireless/rtlwifi/rtl8821ae/sw.c | 5 +
drivers/net/wireless/rtlwifi/wifi.h | 3 +
drivers/of/platform.c | 1 +
drivers/pci/pci-sysfs.c | 2 +-
drivers/pinctrl/intel/pinctrl-baytrail.c | 59 ++-
drivers/scsi/mvsas/mv_sas.c | 2 +
drivers/staging/iio/accel/sca3000_ring.c | 2 +-
drivers/staging/iio/adc/mxs-lradc.c | 9 +-
.../staging/lustre/include/linux/lnet/lib-lnet.h | 2 +-
drivers/staging/rtl8712/usb_intf.c | 1 +
drivers/tty/n_tty.c | 2 +-
drivers/tty/serial/8250/8250_dma.c | 4 -
drivers/tty/serial/8250/8250_pci.c | 21 +
drivers/tty/tty_audit.c | 2 +-
drivers/tty/tty_io.c | 4 +
drivers/tty/tty_ioctl.c | 4 -
drivers/usb/chipidea/ci_hdrc_imx.c | 131 ++++-
drivers/usb/chipidea/udc.c | 17 +
drivers/usb/class/usblp.c | 2 +-
drivers/usb/dwc3/core.c | 10 +-
drivers/usb/dwc3/core.h | 18 +
drivers/usb/dwc3/dwc3-pci.c | 25 +
drivers/usb/dwc3/gadget.c | 61 ++-
drivers/usb/gadget/udc/atmel_usba_udc.c | 2 +-
drivers/usb/host/ehci-orion.c | 3 +-
drivers/usb/host/xhci-pci.c | 1 +
drivers/usb/host/xhci-ring.c | 20 +-
drivers/usb/host/xhci.c | 10 +
drivers/usb/musb/musb_core.c | 10 +-
drivers/usb/serial/option.c | 11 +
drivers/usb/serial/qcserial.c | 96 +++-
drivers/usb/serial/ti_usb_3410_5052.c | 2 +
drivers/usb/serial/ti_usb_3410_5052.h | 4 +
fs/Kconfig | 1 +
fs/Makefile | 1 +
fs/btrfs/ioctl.c | 5 +-
fs/overlayfs/copy_up.c | 6 +-
fs/overlayfs/super.c | 2 +
fs/proc/array.c | 16 +-
fs/proc/base.c | 9 +-
fs/wrapfs/Kconfig | 8 +
fs/wrapfs/Makefile | 7 +
fs/wrapfs/dentry.c | 49 ++
fs/wrapfs/file.c | 381 ++++++++++++++
fs/wrapfs/inode.c | 584 +++++++++++++++++++++
fs/wrapfs/lookup.c | 304 +++++++++++
fs/wrapfs/main.c | 174 ++++++
fs/wrapfs/mmap.c | 93 ++++
fs/wrapfs/super.c | 168 ++++++
fs/wrapfs/wrapfs.h | 205 ++++++++
include/linux/kvm_host.h | 11 +
include/linux/namei.h | 2 +
include/linux/tty.h | 6 +-
include/net/inet_common.h | 3 +-
include/sound/soc.h | 6 +-
include/sound/wm8904.h | 2 +-
include/uapi/linux/magic.h | 2 +
kernel/module.c | 8 +-
lib/fault-inject.c | 2 +-
mm/filemap.c | 9 +-
mm/huge_memory.c | 3 +-
net/bluetooth/hidp/core.c | 14 +
net/bluetooth/mgmt.c | 12 +-
net/core/dst.c | 2 +-
net/ipv4/fib_trie.c | 2 +-
net/ipv4/gre_offload.c | 3 +-
net/ipv4/ipmr.c | 6 +-
net/ipv4/sysctl_net_ipv4.c | 4 +-
net/ipv6/addrconf.c | 1 +
net/ipv6/sit.c | 26 +-
net/irda/irlmp.c | 2 +-
net/mac80211/mlme.c | 21 +-
net/mac80211/trace.h | 10 +-
net/mac80211/util.c | 7 +
net/netlink/af_netlink.c | 1 +
net/nfc/nci/hci.c | 90 +++-
net/packet/af_packet.c | 80 +--
net/rds/connection.c | 6 +
net/rds/tcp_recv.c | 11 +-
net/tipc/msg.c | 12 +-
net/tipc/udp_media.c | 5 +
net/wireless/nl80211.c | 12 +-
sound/pci/hda/hda_codec.c | 4 +-
sound/pci/hda/patch_conexant.c | 1 +
sound/soc/soc-ops.c | 28 +
sound/usb/midi.c | 46 ++
sound/usb/quirks-table.h | 11 +
sound/usb/quirks.c | 2 +
sound/usb/usbaudio.h | 1 +
239 files changed, 3744 insertions(+), 575 deletions(-)
commit 199f15deb977ee3e4786fd6e25277ee1fe5c12df
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Nov 3 21:31:17 2015 -0500
Wrapfs: update copyright year to 2015
commit 7e0ad8b98a79c00c413264da8d52e4e80cd420a6
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Nov 3 21:31:17 2015 -0500
Wrapfs: use vfs xattr helpers
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 13b6f0cd8922bb5af87b7e1773c297a6182d6379
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Fri Sep 4 22:11:34 2015 -0400
Wrapfs: update ->direct_IO op prototype
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit d7a32e5f1c3ae41896aa2a36fae3be17c42a70a5
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Fri Sep 4 22:10:34 2015 -0400
Wrapfs: use d_inode macro
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 92f948ad2e17f3457b938f6f1a77103c9d7ba9ec
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Fri Sep 4 22:09:34 2015 -0400
Wrapfs: remove aio_read/write ops
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 28b15ddb0c09194ba6c7db7ed0b51b2bf775f1d2
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Fri Aug 15 22:48:32 2014 -0400
Wrapfs: properly copy meta-data after AIO operations from lower inode
Signed-off-by: Mengyang Li <li.mengyang at stonybrook.edu>
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit a4a30f53582c03aab50b1fe90a7a2560c07fb6d4
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Mon Aug 11 18:10:35 2014 -0400
Wrapfs: leave placeholders for updating upper inode after AIO
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 7e414f7f2ac6bca0ee58374a5a865c3715ef32d4
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Sun Aug 10 00:40:56 2014 -0400
Wrapfs: protect lower_file by ref-count during aio operation
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
Signed-off-by: Mengyang Li <li.mengyang at stonybrook.edu>
commit 4a8ab1c80a60829803998728264d5f8232c689a4
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Sun Aug 10 00:40:56 2014 -0400
Wrapfs: add read_iter/write_iter opeations
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
Signed-off-by: Mengyang Li <li.mengyang at stonybrook.edu>
commit 79e25789afaa4c4d5225afe26a030f0d641f3bf2
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Sun Aug 10 00:40:56 2014 -0400
Wrapfs: update to new direct_IO interface
Signed-off-by: Mengyang Li <li.mengyang at stonybrook.edu>
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 616a23a3730b8566df0e843f83dc09f9606452e0
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Sat Jul 26 19:06:53 2014 -0400
Wrapfs: update wrapfs_fsync
In v3.16 generic_file_fsync will access ->i_sb->s_bdev->bd_disk, but
s_bdev is NULL for wrapfs inode. This will trigger a kernel panic in
xfstests generic/075, generic/091, etc. as of kernel v3.16-rc1.
This patch fixes this issue by using __generic_file_fsync, a new
interface introduced in v3.16.
Signed-off-by: Mengyang Li <li.mengyang at stonybrook.edu>
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 0f750eb43de8e78ad0472aafefa8a323b13b4aa6
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Wed Jun 25 22:37:16 2014 -0400
Wrapfs: fix ->llseek to update upper and lower offsets
Fixes bug: xfstests generic/257. f_pos consistently is required by and
only by dir_ops->wrapfs_readdir, main_ops is not affected.
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
Signed-off-by: Mengyang Li <li.mengyang at stonybrook.edu>
commit 6858d8c1eb55e890842d05169fbdbb85911a6d62
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Wed Jun 25 22:30:27 2014 -0400
Wrapfs: support extended attributes (xattr) operations
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
Signed-off-by: Mengyang Li <li.mengyang at stonybrook.edu>
commit 61adbed20da533491486268c851a16b8cb545f55
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Fri Jun 20 19:40:04 2014 -0400
Wrapfs: support asynchronous-IO (AIO) operations
Signed-off-by: Li Mengyang <li.mengyang at stonybrook.edu>
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit a090f834047ba929b323d357735b542ad51280fb
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Fri Jun 20 19:39:40 2014 -0400
Wrapfs: support direct-IO (DIO) operations
Signed-off-by: Li Mengyang <li.mengyang at stonybrook.edu>
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 9ef1facea53c649500e1e120aa9e27a37e212c20
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Wed May 14 23:45:28 2014 -0400
Wrapfs: implement vm_ops->page_mkwrite
Some file systems (e.g., ext4) require it. Reported by Ted Ts'o.
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 706aee1531a05328768c99c6e6f725dd1a802f3a
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Sat Apr 26 22:43:20 2014 -0400
Wrapfs: use new vfs_rename prototype
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 9b71e269861ffff6682702bb5ddadbb16ed6ac2c
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Thu Apr 3 13:24:28 2014 -0400
Wrapfs: update documentation
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 000054c34fca675c9225c7078b5c7eab7a6599c4
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Thu Apr 3 13:17:55 2014 -0400
Wrapfs: update maintainers
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit ab2b352453a8f128bac9c58bc8f6aa1be9e39c96
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Jan 21 03:03:00 2014 -0500
Wrapfs: update documentation
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit f7c73696cfe6e50bbd418d50bde7871178ad3d85
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Jan 21 01:25:54 2014 -0500
Wrapfs: 2014 Copyright update
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit f9de26913d8cad100b7d29ca8efaa1a4e4395a6b
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Nov 26 23:05:22 2013 -0500
Wrapfs: use generic put_link helper
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 6b4ad4d979af68de41db665e65075095187a11f8
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Nov 26 23:03:46 2013 -0500
Wrapfs: remove unnecessary initializations
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit bf3e048ac4f80912d48a5e474788353732519f5f
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Sun Nov 24 11:12:07 2013 -0500
Wrapfs: remove deprecated init_lower_nd
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 30b679e0b85d769f28b28fa71694cf1819166c22
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Nov 19 19:00:00 2013 -0500
Wrapfs: update MAINTAINERS info
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 3a0a5198ca0552b326feb862002ea9741a4b6917
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Nov 19 18:59:47 2013 -0500
patch wrapfs-copyright-update.patch
commit 5046d15da08ef4f11c5a1bbfa60fff857f096b9c
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Nov 19 17:23:31 2013 -0500
Wrapfs: use DCACHE_OP_REVALIDATE flag in ->d_revalidate
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 09a42242926f3bc62bcb42758025072e551e572c
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Nov 19 17:22:31 2013 -0500
Wrapfs: implement ->getattr
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 72f97b6648b212975c365b3cee857d42bb6f1672
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Nov 19 17:21:31 2013 -0500
Wrapfs: use file_inode helper
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 3f93170b01bdf9a6484386adcee8d4a2250ab8c5
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Nov 19 17:20:31 2013 -0500
Wrapfs: call filemap_write_and_wait in ->flush
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 7d628a1ad7101ad57eb789eaedd4b40fb17de1fa
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Nov 19 17:19:31 2013 -0500
Wrapfs: handle new VFS API with delegation support
For now, wrapfs isn't supporting NFS delegations.
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 2e2b6e8242307a4f4d8fe753821440e3018a9bfd
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Nov 19 17:18:31 2013 -0500
VFS: export vfs_path_lookup
In 3.12, this useful function was unexported: wrapfs needs a way to lookup
relative to a struct path and use a proper vfsmount, unlike lookup_one_len.
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 0c1ecc4b898c51954db368a4f25330fd8a7e86bd
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Nov 19 17:17:31 2013 -0500
Wrapfs: ->readdir op now ->iterate
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 8de0f50ddd26e0918951d8f725e9b6726c610db6
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Wed Jun 5 01:36:58 2013 -0400
Wrapfs: copy lower inode attributes in ->ioctl
Some ioctls (e.g., EXT2_IOC_SETFLAGS) can change inode attributes, so copy
them from lower inode.
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit c8c2e0c7348def79323eb70358033e4d67cf7165
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Wed Jun 5 01:36:58 2013 -0400
Wrapfs: remove unnecessary call to vm_unmap in ->mmap
Code is unnecessary and causes deadlocks in newer kernels.
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 3352986868995f8781095f358f81bc9275a7e140
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Jun 4 23:19:32 2013 -0400
Wrapfs: declare MODULE_ALIAS_FS
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit c2951e3737043da0ed8fa0b93da838b687b991f5
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Jun 4 23:19:32 2013 -0400
Wrapfs: don't use FS_REVAL_DOT in fs_flags
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 0953692fc70f24ccfa6b8cbd0c4467cedb3ea888
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Jun 4 23:19:31 2013 -0400
Wrapfs: remove dependency on now-defunct CONFIG_EXPERIMENTAL
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 6c7a5c4b68bfb066f9a8d5b1d6b5df433165c71e
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Jun 4 23:19:31 2013 -0400
Wrapfs: dentry_open() no longer does mntput/dput
We need to grab a reference on the path before dentry_open, and drop it
after.
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit c6a97ac0593b1457c127b5785a7399bc9c82a796
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Jun 4 23:19:30 2013 -0400
Wrapfs: no need to call mnt_want_write any longer
Apparently this is now being done by the VFS.
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 57e493581cf8553f0df72bc07fc7082c96bcba41
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Jun 4 23:19:30 2013 -0400
Wrapfs: remove VM_CAN_NONLINEAR flag use in ->mmap
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 326bf632701b995da69e7f696e0927220706976b
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Jun 4 23:19:29 2013 -0400
Wrapfs: ->lookup takes flags not a nameidata
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit ae03d108f87e8ab6b79c4cea20dc86d55b183bee
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Jun 4 23:19:29 2013 -0400
Wrapfs: ->create no longer takes a nameidata, only a flag
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 3bff050ecac95f04d7c57f3dd6edc9dc050ddad7
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Jun 4 23:19:29 2013 -0400
Wrapfs: ->d_revalidate now takes namei flags, not nameidata
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit e3fec23a195059f94dbe1efe979edf4d80bcd22e
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Jun 4 23:19:28 2013 -0400
Wrapfs: struct nameidata no longer has an open-intent data
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit c2f02bbf3bda0966b6ac516f2b8ea714f7268351
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Jun 4 23:19:28 2013 -0400
Wrapfs: dentry_open now takes a struct path
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 007006a14018fd4b86ac6f65a64b0d1c0775d0a8
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Jun 4 23:19:27 2013 -0400
Wrapfs: use vm_munmap in ->mmap
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit e9f8a2fd543ccec583657e082698cbfb646736df
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Jun 4 23:19:27 2013 -0400
Wrapfs: use clear_inode in evict_inode
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 6285206f285c8fd63a9532dd66f65d65116679cf
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Jun 4 23:19:26 2013 -0400
Wrapfs: use d_make_root
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit fd0145760dff04ca26b8056f828d31eedbcf3149
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Jan 31 04:40:19 2012 -0500
Wrapfs: use mode_t
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 32f1c0fa9d66c4cdfd62c4f2dc843da54679c5e3
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Sun Jan 29 20:34:27 2012 -0500
Wrapfs: use set_nlink()
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit da8411705c84ea8f3c5e1b7e5b9de4d5672fd90c
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Fri Sep 9 00:47:49 2011 -0400
Wrapfs: drop our dentry in ->rmdir
Also clear nlinks on our inode.
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit df2226c587858d038b34662662dbb51700aa501b
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Sep 6 00:10:32 2011 -0400
Wrapfs: use d_alloc_root
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 588d9903842e03cbeab517b4306fa273320d08c7
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Sep 6 00:10:31 2011 -0400
Wrapfs: use d_set_d_op
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit c64bf6463da4e36e33a358bfd39ef28b03095d17
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Sep 6 00:10:30 2011 -0400
Wrapfs: use updated vfs_path_lookup prototype
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 1943006442040b07de5e7c5bc7c7473fa0e7e77a
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Sep 6 00:10:30 2011 -0400
Wrapfs: ->fsync updates for new prototype
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 38e742a21b0987a8d6c2ccbf8e52346b3831e0b8
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Sep 6 00:10:29 2011 -0400
Wrapfs: support LOOKUP_RCU in ->d_revalidate
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 7fd01132dc523ffd803bd3ab5596a4e7a2f0ee41
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Sep 6 00:10:28 2011 -0400
Wrapfs: new ->permission prototype and fixes.
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 8c4b108b63ac2d0f36e5a772c66f6ab4a5d750a6
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Mon May 2 02:00:02 2011 -0400
Wrapfs: lookup fixes
Don't use lookup_one_len any longer (doesn't work for NFS).
Initialize lower wrapfs_dentry_info so lower_path is NULL.
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit d189374295b690127463e3c7366f91cb6514afd1
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Fri Mar 18 13:14:28 2011 -0400
Wrapfs: remove extra debug in rmdir
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 63ac767d2a941ec957d8072a2288393a98b59565
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Fri Mar 18 12:38:01 2011 -0400
Wrapfs: checkpatch fixes
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit a4afb74baca5b7270229edfcc5b2b998e98bdd22
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Fri Mar 18 00:45:17 2011 -0400
Wrapfs: port to 2.6.39
Remove lock/unlock_kernel in ->fasync.
Convert from ->get_sb to ->mount op.
Remove include to smp_lock.h, added sched.h.
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 46354a8ce7fa7b21c6024c254eeb245d06c82e51
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Thu Mar 17 23:21:55 2011 -0400
Wrapfs: copyright update for 2011
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 9d49d318c283ba1cce8225190e8261620b064bf3
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Thu Mar 17 23:21:55 2011 -0400
Wrapfs: better handling of NFS silly-renamed files
In ->unlink, if we try to unlink an NFS silly-renamed file, NFS returns
-EBUSY. We have to treat it as a success and return 0 to the VFS. NFS will
remove silly-deleted files later on anyway.
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 887ed032bfc981fa6bcb4a557bf9e2c17ad26281
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Thu Mar 17 23:21:55 2011 -0400
Wrapfs: update parent directory inode size in inode ops
After ->unlink, ->rmdir, and ->rename, we need to copy the (possibly
changed) inode size of the parent directory(ies) where the operation took
place.
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 8a62de8cdd86b3a4374c0173d8969b2a67716870
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Thu Mar 17 23:21:55 2011 -0400
Wrapfs: remove unnecessary calls to copy lower inode->n_links
Removed from ->create, ->symlink, and ->mknod.
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 5d02cf9fe12aefd373e436ffd3495a9e3777ea70
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Mon Mar 7 23:20:33 2011 -0500
Wrapfs: ->setattr fixes
Call inode_change_ok on our inode, not lower.
Don't copy inode sizes (VFS does it).
Pass lower file in struct iattr passed to notify_change on lower inode.
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit e2c2a0d7993659dcb4231383ff70daf406bd27dc
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Sun Mar 6 16:23:16 2011 -0500
Wrapfs: update ->permission prototye and code for new iperm flag
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit f26fd1091e7f8ff424fdd4eb5b413bd79ce6be97
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Fri Nov 12 18:15:05 2010 -0500
Wrapfs: handle maxbytes properly
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit de44a9929442334720457515cbfa0a0921d1c763
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Sat Sep 11 15:49:33 2010 -0400
Wrapfs: support ->unlocked_ioctl and ->compat_ioctl
Old ->ioctl was split into ->unlocked_ioctl and ->compat_ioctl. Compat
version doesn't need to lock_kernel any longer.
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit bc9bc7f417ed58447d92aada3254bf77765df7ea
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Aug 10 23:50:14 2010 -0400
Wrapfs: new vfs_statfs and ->evict_inode prototypes
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 78d8f16e0bcb046116b23379660b252c931dfc90
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Fri Aug 6 23:37:29 2010 -0400
Wrapfs: update ->fsync prototype
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 44f8ff38a128523ddca31bb4e00f5d282a43813b
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Apr 20 21:22:02 2010 -0400
Wrapfs: update documentation
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 9f550dac1b25add93e4518bfd0e2a39c7fd8d1bc
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Apr 20 15:32:09 2010 -0400
Wrapfs: include slab.h
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 86d4ff0b9cc3e41965ec2beb957f3d3b54cd4ae6
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Apr 20 15:26:02 2010 -0400
Wrapfs: avoid an extra path_get/put pair in wrapfs_open
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 5e40808b47321bf574eefc976bba9a0a799815ea
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Fri Feb 26 03:18:04 2010 -0500
Wrapfs: decrement nd_path on follow_link error
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit a3afeee9edff026c791ddc42d6527cdc47eee98b
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Tue Jan 5 04:27:00 2010 -0500
Wrapfs: don't mention kernel version in modload message
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit dcc21932ccb4caedb00bf618f1a745e1156ebe8c
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Mon Jan 4 20:45:06 2010 -0500
Kconfig: hook to configure Wrapfs
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 82656f28c3fbef4c31bc804e124232dcd2b902df
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Mon Jan 4 20:45:06 2010 -0500
Makefile: hook to compile Wrapfs
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit e70faebb437174b730427305b23c46baddd3c190
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Mon Jan 4 20:45:06 2010 -0500
Wrapfs: file system magic number
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 90fb0bb526cd19ae84531b10b1ff7f956b89be17
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Mon Jan 4 20:45:06 2010 -0500
Wrapfs: Kconfig options
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit f90c407c81a2c5874181be13099c986f2d6eca53
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Mon Jan 4 20:45:06 2010 -0500
Wrapfs: main Makefile
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit a91f5a9bf88cceb4ec95938836fbe0fb2b58523f
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Mon Jan 4 20:45:06 2010 -0500
Wrapfs: vm_ops operations
Includes necessary address_space workaround ops.
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit f389ec94ea16ffc0fe298f7f181d148bade8c0dc
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Mon Jan 4 20:45:06 2010 -0500
Wrapfs: mount-time and module-linkage functions
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit f9930ed23352f5a05bd724e91511b9901312d648
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Mon Jan 4 20:45:06 2010 -0500
Wrapfs: lookup-related functions
Main lookup function, nameidata helpers, and stacking-interposition
functions.
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 8e31dab6847b889dcbeaabfd29f7f7a62016e805
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Mon Jan 4 20:45:06 2010 -0500
Wrapfs: file operations
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 0bd660eee91e0fbe119e6ca764173358cf2ecda7
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Mon Jan 4 20:45:06 2010 -0500
Wrapfs: dentry operations
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit cdbe82578ade7abc828a2043dfd138ac72af6c31
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Mon Jan 4 20:45:06 2010 -0500
Wrapfs: inode operations
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 7d81482d7d999fc73306f4a948e7dfbd88c3e01e
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Mon Jan 4 20:45:06 2010 -0500
Wrapfs: superblock operations
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit d9fe9223e6d60474e5a9e251f7b612dab7387299
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Mon Jan 4 20:45:06 2010 -0500
Wrapfs: main header file
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 051a11db63b91c6b51ae1465bbb15b9d86cd78dd
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Mon Jan 4 20:45:06 2010 -0500
Wrapfs: Maintainers
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 3d4cddb3869dd98bb91253f60f8cd80f5d6e8171
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Mon Jan 4 20:45:06 2010 -0500
Documentation: index entry for Wrapfs
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit 2a557adb9109bc32dc9b3e864a63dc0270839d38
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date: Mon Jan 4 20:45:06 2010 -0500
Wrapfs: introduction and usage documentation
Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>
commit cb371265c2f1a0dd0cee03bd7fff413d671c53f0
Author: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
Date: Wed Dec 9 14:03:42 2015 -0500
Linux 4.1.14
commit a52ec6de6d1638e8c203d7188c55627f75371612
Author: Herbert Xu <herbert at gondor.apana.org.au>
Date: Tue Dec 8 14:13:19 2015 +0800
netlink: Add missing goto statement to netlink_insert
The backport of 1f770c0a09da855a2b51af6d19de97fb955eca85 ("netlink:
Fix autobind race condition that leads to zero port ID") missed a
goto statement, which causes netlink to break subtly.
This was discovered by Stefan Priebe <s.priebe at profihost.ag>.
Fixes: 4e2776241766 ("netlink: Fix autobind race condition that...")
Reported-by: Stefan Priebe <s.priebe at profihost.ag>
Reported-by: Philipp Hahn <pmhahn at pmhahn.de>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Acked-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
commit 3f11689e161c77fa0bcda8a5aa3b4829c7da7fab
Author: David Hildenbrand <dahi at linux.vnet.ibm.com>
Date: Fri Nov 6 12:08:48 2015 +0100
KVM: s390: enable SIMD only when no VCPUs were created
commit 5967c17b118a2bd1dd1d554cc4eee16233e52bec upstream.
We should never allow to enable/disable any facilities for the guest
when other VCPUs were already created.
kvm_arch_vcpu_(load|put) relies on SIMD not changing during runtime.
If somebody would create and run VCPUs and then decides to enable
SIMD, undefined behaviour could be possible (e.g. vector save area
not being set up).
Acked-by: Christian Borntraeger <borntraeger at de.ibm.com>
Acked-by: Cornelia Huck <cornelia.huck at de.ibm.com>
Signed-off-by: David Hildenbrand <dahi at linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
commit 5051ab9f8dbc131c01acc79c0a8b010e0651fbbe
Author: Arnd Bergmann <arnd at arndb.de>
Date: Sun Sep 27 16:45:01 2015 -0400
staging/lustre: use jiffies for lp_last_query times
commit 9f088dba3cc267ea11ec0da318cd0175575b5f9b upstream.
The recently introduced lnet_peer_set_alive() function uses
get_seconds() to read the current time into a shared variable,
but all other uses of that variable compare it to jiffies values.
This changes the current use to jiffies as well for consistency.
Signed-off-by: Arnd Bergmann <arnd at arndb.de>
Fixes: af3fa7c71bf ("staging/lustre/lnet: peer aliveness status and NI status")
Cc: Liang Zhen <liang.zhen at intel.com>
Cc: James Simmons <uja.ornl at gmail.com>
Cc: Isaac Huang <he.huang at intel.com>
Signed-off-by: Oleg Drokin <oleg.drokin at intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
commit 84390caa6331908d76aa63b8eda0e69f557dda06
Author: Rajmohan Mani <rajmohan.mani at intel.com>
Date: Wed Nov 18 10:48:20 2015 +0200
xhci: Workaround to get Intel xHCI reset working more reliably
commit a5964396190d0c40dd549c23848c282fffa5d1f2 upstream.
Existing Intel xHCI controllers require a delay of 1 mS,
after setting the CMD_RESET bit in command register, before
accessing any HC registers. This allows the HC to complete
the reset operation and be ready for HC register access.
Without this delay, the subsequent HC register access,
may result in a system hang, very rarely.
Verified CherryView / Braswell platforms go through over
5000 warm reboot cycles (which was not possible without
this patch), without any xHCI reset hang.
Signed-off-by: Rajmohan Mani <rajmohan.mani at intel.com>
Tested-by: Joe Lawrence <joe.lawrence at stratus.com>
Signed-off-by: Mathias Nyman <mathias.nyman at linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
commit ff4fcbdf43bc4ae760ef1e7782e233156ed90a75
Author: Peter Hurley <peter at hurleysoftware.com>
Date: Wed Nov 11 08:03:54 2015 -0500
tty: Fix tty_send_xchar() lock order inversion
commit ee0c1a65cf95230d5eb3d9de94fd2ead9a428c67 upstream.
The correct lock order is atomic_write_lock => termios_rwsem, as
established by tty_write() => n_tty_write().
Fixes: c274f6ef1c666 ("tty: Hold termios_rwsem for tcflow(TCIxxx)")
Reported-and-Tested-by: Dmitry Vyukov <dvyukov at google.com>
Signed-off-by: Peter Hurley <peter at hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
commit 8d0fe5721d2725e58429a9b54149a20f9f590451
Author: Peter Hurley <peter at hurleysoftware.com>
Date: Sun Nov 8 08:52:31 2015 -0500
tty: audit: Fix audit source
commit 6b2a3d628aa752f0ab825fc6d4d07b09e274d1c1 upstream.
The data to audit/record is in the 'from' buffer (ie., the input
read buffer).
Fixes: 72586c6061ab ("n_tty: Fix auditing support for cannonical mode")
Cc: Miloslav TrmaÄ <mitr at redhat.com>
Signed-off-by: Peter Hurley <peter at hurleysoftware.com>
Acked-by: Laura Abbott <labbott at fedoraproject.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
diff --git a/Documentation/devicetree/bindings/mfd/mfd.txt b/Documentation/devicetree/bindings/mfd/mfd.txt
new file mode 100644
index 0000000..af9d693
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/mfd.txt
@@ -0,0 +1,41 @@
+Multi-Function Devices (MFD)
+
+These devices comprise a nexus for heterogeneous hardware blocks containing
+more than one non-unique yet varying hardware functionality.
+
+A typical MFD can be:
+
+- A mixed signal ASIC on an external bus, sometimes a PMIC (Power Management
+ Integrated Circuit) that is manufactured in a lower technology node (rough
+ silicon) that handles analog drivers for things like audio amplifiers, LED
+ drivers, level shifters, PHY (physical interfaces to things like USB or
+ ethernet), regulators etc.
+
+- A range of memory registers containing "miscellaneous system registers" also
+ known as a system controller "syscon" or any other memory range containing a
+ mix of unrelated hardware devices.
+
+Optional properties:
+
+- compatible : "simple-mfd" - this signifies that the operating system should
+ consider all subnodes of the MFD device as separate devices akin to how
+ "simple-bus" inidicates when to see subnodes as children for a simple
+ memory-mapped bus. For more complex devices, when the nexus driver has to
+ probe registers to figure out what child devices exist etc, this should not
+ be used. In the latter case the child devices will be determined by the
+ operating system.
+
+Example:
+
+foo at 1000 {
+ compatible = "syscon", "simple-mfd";
+ reg = <0x01000 0x1000>;
+
+ led at 08.0 {
+ compatible = "register-bit-led";
+ offset = <0x08>;
+ mask = <0x01>;
+ label = "myled";
+ default-state = "on";
+ };
+};
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index c3b6b30..749b7ba 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -140,7 +140,8 @@ Table 1-1: Process specific entries in /proc
stat Process status
statm Process memory status information
status Process status in human readable form
- wchan If CONFIG_KALLSYMS is set, a pre-decoded wchan
+ wchan Present with CONFIG_KALLSYMS=y: it shows the kernel function
+ symbol the task is blocked in - or "0" if not blocked.
pagemap Page table
stack Report full stack trace, enable via CONFIG_STACKTRACE
smaps a extension based on maps, showing the memory consumption of
@@ -309,7 +310,7 @@ Table 1-4: Contents of the stat files (as of 2.6.30-rc7)
blocked bitmap of blocked signals
sigign bitmap of ignored signals
sigcatch bitmap of caught signals
- wchan address where process went to sleep
+ 0 (place holder, used to be the wchan address, use /proc/PID/wchan instead)
0 (place holder)
0 (place holder)
exit_signal signal to send to parent thread on exit
diff --git a/Makefile b/Makefile
index 2320f19..091280d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 4
PATCHLEVEL = 1
-SUBLEVEL = 12
+SUBLEVEL = 14
EXTRAVERSION =
NAME = Series 4800
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index c9df40e..e839787 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@ -354,11 +354,12 @@
/* SMPS9 unused */
ldo1_reg: ldo1 {
- /* VDD_SD */
+ /* VDD_SD / VDDSHV8 */
regulator-name = "ldo1";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
regulator-boot-on;
+ regulator-always-on;
};
ldo2_reg: ldo2 {
diff --git a/arch/arm/boot/dts/armada-385-db-ap.dts b/arch/arm/boot/dts/armada-385-db-ap.dts
index 7219ac3..9f730e8 100644
--- a/arch/arm/boot/dts/armada-385-db-ap.dts
+++ b/arch/arm/boot/dts/armada-385-db-ap.dts
@@ -46,7 +46,7 @@
/ {
model = "Marvell Armada 385 Access Point Development Board";
- compatible = "marvell,a385-db-ap", "marvell,armada385", "marvell,armada38x";
+ compatible = "marvell,a385-db-ap", "marvell,armada385", "marvell,armada380";
chosen {
stdout-path = "serial1:115200n8";
diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index 146e711..a0ec8bf 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -915,6 +915,11 @@
};
};
+&pmu_system_controller {
+ assigned-clocks = <&pmu_system_controller 0>;
+ assigned-clock-parents = <&clock CLK_FIN_PLL>;
+};
+
&rtc {
status = "okay";
clocks = <&clock CLK_RTC>, <&max77802 MAX77802_CLK_32K_AP>;
diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index 02eb8b1..1171f34 100644
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -878,6 +878,11 @@
};
};
+&pmu_system_controller {
+ assigned-clocks = <&pmu_system_controller 0>;
+ assigned-clock-parents = <&clock CLK_FIN_PLL>;
+};
+
&rtc {
status = "okay";
clocks = <&clock CLK_RTC>, <&max77802 MAX77802_CLK_32K_AP>;
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index bc215e4..6a87233 100644
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -477,7 +477,10 @@
compatible = "fsl,imx27-usb";
reg = <0x10024000 0x200>;
interrupts = <56>;
- clocks = <&clks IMX27_CLK_USB_IPG_GATE>;
+ clocks = <&clks IMX27_CLK_USB_IPG_GATE>,
+ <&clks IMX27_CLK_USB_AHB_GATE>,
+ <&clks IMX27_CLK_USB_DIV>;
+ clock-names = "ipg", "ahb", "per";
fsl,usbmisc = <&usbmisc 0>;
status = "disabled";
};
@@ -486,7 +489,10 @@
compatible = "fsl,imx27-usb";
reg = <0x10024200 0x200>;
interrupts = <54>;
- clocks = <&clks IMX27_CLK_USB_IPG_GATE>;
+ clocks = <&clks IMX27_CLK_USB_IPG_GATE>,
+ <&clks IMX27_CLK_USB_AHB_GATE>,
+ <&clks IMX27_CLK_USB_DIV>;
+ clock-names = "ipg", "ahb", "per";
fsl,usbmisc = <&usbmisc 1>;
dr_mode = "host";
status = "disabled";
@@ -496,7 +502,10 @@
compatible = "fsl,imx27-usb";
reg = <0x10024400 0x200>;
interrupts = <55>;
- clocks = <&clks IMX27_CLK_USB_IPG_GATE>;
+ clocks = <&clks IMX27_CLK_USB_IPG_GATE>,
+ <&clks IMX27_CLK_USB_AHB_GATE>,
+ <&clks IMX27_CLK_USB_DIV>;
+ clock-names = "ipg", "ahb", "per";
fsl,usbmisc = <&usbmisc 2>;
dr_mode = "host";
status = "disabled";
@@ -506,7 +515,6 @@
#index-cells = <1>;
compatible = "fsl,imx27-usbmisc";
reg = <0x10024600 0x200>;
- clocks = <&clks IMX27_CLK_USB_AHB_GATE>;
};
sahara2: sahara at 10025000 {
diff --git a/arch/arm/boot/dts/imx6dl-riotboard.dts b/arch/arm/boot/dts/imx6dl-riotboard.dts
index 43cb3fd..5111f51 100644
--- a/arch/arm/boot/dts/imx6dl-riotboard.dts
+++ b/arch/arm/boot/dts/imx6dl-riotboard.dts
@@ -305,8 +305,8 @@
&usdhc2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc2>;
- cd-gpios = <&gpio1 4 0>;
- wp-gpios = <&gpio1 2 0>;
+ cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
+ wp-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
vmmc-supply = <®_3p3v>;
status = "okay";
};
@@ -314,8 +314,8 @@
&usdhc3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>;
- cd-gpios = <&gpio7 0 0>;
- wp-gpios = <&gpio7 1 0>;
+ cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
+ wp-gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>;
vmmc-supply = <®_3p3v>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6q-arm2.dts b/arch/arm/boot/dts/imx6q-arm2.dts
index 78df05e..d6515f7 100644
--- a/arch/arm/boot/dts/imx6q-arm2.dts
+++ b/arch/arm/boot/dts/imx6q-arm2.dts
@@ -11,6 +11,7 @@
*/
/dts-v1/;
+#include <dt-bindings/gpio/gpio.h>
#include "imx6q.dtsi"
/ {
@@ -196,8 +197,8 @@
};
&usdhc3 {
- cd-gpios = <&gpio6 11 0>;
- wp-gpios = <&gpio6 14 0>;
+ cd-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>;
+ wp-gpios = <&gpio6 14 GPIO_ACTIVE_HIGH>;
vmmc-supply = <®_3p3v>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3
diff --git a/arch/arm/boot/dts/imx6q-gk802.dts b/arch/arm/boot/dts/imx6q-gk802.dts
index 703539c..00bd63e 100644
--- a/arch/arm/boot/dts/imx6q-gk802.dts
+++ b/arch/arm/boot/dts/imx6q-gk802.dts
@@ -7,6 +7,7 @@
*/
/dts-v1/;
+#include <dt-bindings/gpio/gpio.h>
#include "imx6q.dtsi"
/ {
@@ -161,7 +162,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>;
bus-width = <4>;
- cd-gpios = <&gpio6 11 0>;
+ cd-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>;
vmmc-supply = <®_3p3v>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6q-tbs2910.dts b/arch/arm/boot/dts/imx6q-tbs2910.dts
index a43abfa..5645d52 100644
--- a/arch/arm/boot/dts/imx6q-tbs2910.dts
+++ b/arch/arm/boot/dts/imx6q-tbs2910.dts
@@ -251,7 +251,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc2>;
bus-width = <4>;
- cd-gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
+ cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
vmmc-supply = <®_3p3v>;
status = "okay";
};
@@ -260,7 +260,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>;
bus-width = <4>;
- cd-gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;
+ cd-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
vmmc-supply = <®_3p3v>;
status = "okay";
diff --git a/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi b/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi
index e6d9195..f4d6ae5 100644
--- a/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi
@@ -173,7 +173,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc1>;
vmmc-supply = <®_3p3v>;
- cd-gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>;
+ cd-gpios = <&gpio4 7 GPIO_ACTIVE_LOW>;
status = "okay";
};
@@ -181,7 +181,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc2>;
vmmc-supply = <®_3p3v>;
- cd-gpios = <&gpio4 8 GPIO_ACTIVE_HIGH>;
+ cd-gpios = <&gpio4 8 GPIO_ACTIVE_LOW>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
index d033bb1..6a846e0 100644
--- a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
@@ -259,6 +259,6 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_cubox_i_usdhc2_aux &pinctrl_cubox_i_usdhc2>;
vmmc-supply = <®_3p3v>;
- cd-gpios = <&gpio1 4 0>;
+ cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi b/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi
index 2c253d6..45e7c39 100644
--- a/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi
@@ -1,3 +1,5 @@
+#include <dt-bindings/gpio/gpio.h>
+
/ {
regulators {
compatible = "simple-bus";
@@ -181,7 +183,7 @@
&usdhc2 { /* module slot */
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc2>;
- cd-gpios = <&gpio2 2 0>;
+ cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
index b5756c2..4493f6e 100644
--- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
@@ -318,7 +318,7 @@
&usdhc3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>;
- cd-gpios = <&gpio7 0 GPIO_ACTIVE_HIGH>;
+ cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
vmmc-supply = <®_3p3v>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
index 86f03c1..a857d12 100644
--- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
@@ -324,7 +324,7 @@
&usdhc3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>;
- cd-gpios = <&gpio7 0 GPIO_ACTIVE_HIGH>;
+ cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
vmmc-supply = <®_3p3v>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
index 4a8d97f..1afe338 100644
--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
@@ -417,7 +417,7 @@
&usdhc3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>;
- cd-gpios = <&gpio7 0 GPIO_ACTIVE_HIGH>;
+ cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
vmmc-supply = <®_3p3v>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
index 151a3db..c6833d2 100644
--- a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
@@ -41,6 +41,7 @@
*/
#include "imx6qdl-microsom.dtsi"
#include "imx6qdl-microsom-ar8035.dtsi"
+#include <dt-bindings/gpio/gpio.h>
/ {
chosen {
@@ -288,6 +289,6 @@
&pinctrl_hummingboard_usdhc2
>;
vmmc-supply = <®_3p3v>;
- cd-gpios = <&gpio1 4 0>;
+ cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
index 0821812..64e0b61 100644
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
@@ -449,7 +449,7 @@
&usdhc3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>;
- cd-gpios = <&gpio7 0 0>;
+ cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
vmmc-supply = <®_3p3v>;
status = "okay";
};
@@ -457,7 +457,7 @@
&usdhc4 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc4>;
- cd-gpios = <&gpio2 6 0>;
+ cd-gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
vmmc-supply = <®_3p3v>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
index 1ce6133..9e6ecd9 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
@@ -409,8 +409,8 @@
&usdhc2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc2>;
- cd-gpios = <&gpio1 4 0>;
- wp-gpios = <&gpio1 2 0>;
+ cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
+ wp-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
status = "disabled";
};
@@ -418,7 +418,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3
&pinctrl_usdhc3_cdwp>;
- cd-gpios = <&gpio1 27 0>;
- wp-gpios = <&gpio1 29 0>;
+ cd-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>;
+ wp-gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;
status = "disabled";
};
diff --git a/arch/arm/boot/dts/imx6qdl-rex.dtsi b/arch/arm/boot/dts/imx6qdl-rex.dtsi
index 394a4ac..a5035624 100644
--- a/arch/arm/boot/dts/imx6qdl-rex.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-rex.dtsi
@@ -340,7 +340,7 @@
pinctrl-0 = <&pinctrl_usdhc2>;
bus-width = <4>;
cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
- wp-gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
+ wp-gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;
status = "okay";
};
@@ -349,6 +349,6 @@
pinctrl-0 = <&pinctrl_usdhc3>;
bus-width = <4>;
cd-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
- wp-gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
+ wp-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
index 3b24b126..e329ca5 100644
--- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
@@ -467,8 +467,8 @@
pinctrl-0 = <&pinctrl_usdhc3>;
pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
- cd-gpios = <&gpio6 15 0>;
- wp-gpios = <&gpio1 13 0>;
+ cd-gpios = <&gpio6 15 GPIO_ACTIVE_LOW>;
+ wp-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
index 0b28a9d..1e27485 100644
--- a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
@@ -444,8 +444,8 @@
&usdhc3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>;
- cd-gpios = <&gpio7 0 0>;
- wp-gpios = <&gpio7 1 0>;
+ cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
+ wp-gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>;
vmmc-supply = <®_3p3v>;
status = "okay";
};
@@ -453,7 +453,7 @@
&usdhc4 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc4>;
- cd-gpios = <&gpio2 6 0>;
+ cd-gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
vmmc-supply = <®_3p3v>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index a626e6d..944eb81 100644
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -562,8 +562,8 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc2>;
bus-width = <8>;
- cd-gpios = <&gpio2 2 0>;
- wp-gpios = <&gpio2 3 0>;
+ cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
+ wp-gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;
status = "okay";
};
@@ -571,8 +571,8 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>;
bus-width = <8>;
- cd-gpios = <&gpio2 0 0>;
- wp-gpios = <&gpio2 1 0>;
+ cd-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
+ wp-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
index f02b80b..da08de3 100644
--- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
@@ -680,7 +680,7 @@
pinctrl-0 = <&pinctrl_usdhc1>;
bus-width = <4>;
no-1-8-v;
- cd-gpios = <&gpio7 2 0>;
+ cd-gpios = <&gpio7 2 GPIO_ACTIVE_LOW>;
fsl,wp-controller;
status = "okay";
};
@@ -690,7 +690,7 @@
pinctrl-0 = <&pinctrl_usdhc2>;
bus-width = <4>;
no-1-8-v;
- cd-gpios = <&gpio7 3 0>;
+ cd-gpios = <&gpio7 3 GPIO_ACTIVE_LOW>;
fsl,wp-controller;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
index 5fb0916..9e096d8 100644
--- a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
@@ -9,6 +9,8 @@
*
*/
+#include <dt-bindings/gpio/gpio.h>
+
/ {
regulators {
compatible = "simple-bus";
@@ -250,13 +252,13 @@
&usdhc1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc1>;
- cd-gpios = <&gpio1 2 0>;
+ cd-gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
status = "okay";
};
&usdhc3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>;
- cd-gpios = <&gpio3 9 0>;
+ cd-gpios = <&gpio3 9 GPIO_ACTIVE_LOW>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts
index 945887d..b84dff2 100644
--- a/arch/arm/boot/dts/imx6sl-evk.dts
+++ b/arch/arm/boot/dts/imx6sl-evk.dts
@@ -617,8 +617,8 @@
pinctrl-1 = <&pinctrl_usdhc1_100mhz>;
pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
bus-width = <8>;
- cd-gpios = <&gpio4 7 0>;
- wp-gpios = <&gpio4 6 0>;
+ cd-gpios = <&gpio4 7 GPIO_ACTIVE_LOW>;
+ wp-gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>;
status = "okay";
};
@@ -627,8 +627,8 @@
pinctrl-0 = <&pinctrl_usdhc2>;
pinctrl-1 = <&pinctrl_usdhc2_100mhz>;
pinctrl-2 = <&pinctrl_usdhc2_200mhz>;
- cd-gpios = <&gpio5 0 0>;
- wp-gpios = <&gpio4 29 0>;
+ cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
+ wp-gpios = <&gpio4 29 GPIO_ACTIVE_HIGH>;
status = "okay";
};
@@ -637,6 +637,6 @@
pinctrl-0 = <&pinctrl_usdhc3>;
pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
- cd-gpios = <&gpio3 22 0>;
+ cd-gpios = <&gpio3 22 GPIO_ACTIVE_LOW>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts b/arch/arm/boot/dts/imx6sx-sabreauto.dts
index e3c0b63..115f3fd 100644
--- a/arch/arm/boot/dts/imx6sx-sabreauto.dts
+++ b/arch/arm/boot/dts/imx6sx-sabreauto.dts
@@ -49,7 +49,7 @@
pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
bus-width = <8>;
- cd-gpios = <&gpio7 10 GPIO_ACTIVE_HIGH>;
+ cd-gpios = <&gpio7 10 GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>;
keep-power-in-suspend;
enable-sdio-wakeup;
@@ -61,7 +61,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc4>;
bus-width = <8>;
- cd-gpios = <&gpio7 11 GPIO_ACTIVE_HIGH>;
+ cd-gpios = <&gpio7 11 GPIO_ACTIVE_LOW>;
no-1-8-v;
keep-power-in-suspend;
enable-sdio-wakup;
diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi
index cef04ce..ac88c34 100644
--- a/arch/arm/boot/dts/imx6sx-sdb.dtsi
+++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi
@@ -293,7 +293,7 @@
pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
bus-width = <8>;
- cd-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>;
+ cd-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio2 15 GPIO_ACTIVE_HIGH>;
keep-power-in-suspend;
enable-sdio-wakeup;
@@ -304,7 +304,7 @@
&usdhc4 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc4>;
- cd-gpios = <&gpio6 21 GPIO_ACTIVE_HIGH>;
+ cd-gpios = <&gpio6 21 GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio6 20 GPIO_ACTIVE_HIGH>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts
index 1b958e9..2e7c1364 100644
--- a/arch/arm/boot/dts/omap5-uevm.dts
+++ b/arch/arm/boot/dts/omap5-uevm.dts
@@ -31,6 +31,24 @@
regulator-max-microvolt = <3000000>;
};
+ mmc3_pwrseq: sdhci0_pwrseq {
+ compatible = "mmc-pwrseq-simple";
+ clocks = <&clk32kgaudio>;
+ clock-names = "ext_clock";
+ };
+
+ vmmcsdio_fixed: fixedregulator-mmcsdio {
+ compatible = "regulator-fixed";
+ regulator-name = "vmmcsdio_fixed";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ gpio = <&gpio5 12 GPIO_ACTIVE_HIGH>; /* gpio140 WLAN_EN */
+ enable-active-high;
+ startup-delay-us = <70000>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&wlan_pins>;
+ };
+
/* HS USB Host PHY on PORT 2 */
hsusb2_phy: hsusb2_phy {
compatible = "usb-nop-xceiv";
@@ -197,12 +215,20 @@
>;
};
- mcspi4_pins: pinmux_mcspi4_pins {
+ mmc3_pins: pinmux_mmc3_pins {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x01a4, PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_clk */
+ OMAP5_IOPAD(0x01a6, PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_cmd */
+ OMAP5_IOPAD(0x01a8, PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_data0 */
+ OMAP5_IOPAD(0x01aa, PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_data1 */
+ OMAP5_IOPAD(0x01ac, PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_data2 */
+ OMAP5_IOPAD(0x01ae, PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_data3 */
+ >;
+ };
+
+ wlan_pins: pinmux_wlan_pins {
pinctrl-single,pins = <
- 0x164 (PIN_INPUT | MUX_MODE1) /* mcspi4_clk */
- 0x168 (PIN_INPUT | MUX_MODE1) /* mcspi4_simo */
- 0x16a (PIN_INPUT | MUX_MODE1) /* mcspi4_somi */
- 0x16c (PIN_INPUT | MUX_MODE1) /* mcspi4_cs0 */
+ OMAP5_IOPAD(0x1bc, PIN_OUTPUT | MUX_MODE6) /* mcspi1_clk.gpio5_140 */
>;
};
@@ -276,6 +302,12 @@
0x1A (PIN_OUTPUT | MUX_MODE0) /* fref_clk1_out, USB hub clk */
>;
};
+
+ wlcore_irq_pin: pinmux_wlcore_irq_pin {
+ pinctrl-single,pins = <
+ OMAP5_IOPAD(0x040, WAKEUP_EN | PIN_INPUT_PULLUP | MUX_MODE6) /* llia_wakereqin.gpio1_wk14 */
+ >;
+ };
};
&mmc1 {
@@ -290,8 +322,25 @@
};
&mmc3 {
+ vmmc-supply = <&vmmcsdio_fixed>;
+ mmc-pwrseq = <&mmc3_pwrseq>;
bus-width = <4>;
- ti,non-removable;
+ non-removable;
+ cap-power-off-card;
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc3_pins &wlcore_irq_pin>;
+ interrupts-extended = <&gic GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH
+ &omap5_pmx_core 0x168>;
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+ wlcore: wlcore at 2 {
+ compatible = "ti,wl1271";
+ reg = <2>;
+ interrupt-parent = <&gpio1>;
+ interrupts = <14 IRQ_TYPE_LEVEL_HIGH>; /* gpio 14 */
+ ref-clock-frequency = <26000000>;
+ };
};
&mmc4 {
@@ -591,11 +640,6 @@
pinctrl-0 = <&mcspi3_pins>;
};
-&mcspi4 {
- pinctrl-names = "default";
- pinctrl-0 = <&mcspi4_pins>;
-};
-
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins>;
diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
index a5f5f40..9cf0ab6 100644
--- a/arch/arm/boot/dts/sama5d4.dtsi
+++ b/arch/arm/boot/dts/sama5d4.dtsi
@@ -918,11 +918,11 @@
reg = <0xf8018000 0x4000>;
interrupts = <33 IRQ_TYPE_LEVEL_HIGH 6>;
dmas = <&dma1
- (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1))
- AT91_XDMAC_DT_PERID(4)>,
+ (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
+ | AT91_XDMAC_DT_PERID(4))>,
<&dma1
- (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1))
- AT91_XDMAC_DT_PERID(5)>;
+ (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
+ | AT91_XDMAC_DT_PERID(5))>;
dma-names = "tx", "rx";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c1>;
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 2b4847c..fa36571 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -111,7 +111,7 @@
720000 1200000
528000 1100000
312000 1000000
- 144000 900000
+ 144000 1000000
>;
#cooling-cells = <2>;
cooling-min-level = <0>;
diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c
index 5662a87..3061320 100644
--- a/arch/arm/common/edma.c
+++ b/arch/arm/common/edma.c
@@ -406,7 +406,8 @@ static irqreturn_t dma_irq_handler(int irq, void *data)
BIT(slot));
if (edma_cc[ctlr]->intr_data[channel].callback)
edma_cc[ctlr]->intr_data[channel].callback(
- channel, EDMA_DMA_COMPLETE,
+ EDMA_CTLR_CHAN(ctlr, channel),
+ EDMA_DMA_COMPLETE,
edma_cc[ctlr]->intr_data[channel].data);
}
} while (sh_ipr);
@@ -460,7 +461,8 @@ static irqreturn_t dma_ccerr_handler(int irq, void *data)
if (edma_cc[ctlr]->intr_data[k].
callback) {
edma_cc[ctlr]->intr_data[k].
- callback(k,
+ callback(
+ EDMA_CTLR_CHAN(ctlr, k),
EDMA_DMA_CC_ERROR,
edma_cc[ctlr]->intr_data
[k].data);
diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig
index f1f79d1..60c1a0f 100644
--- a/arch/arm/kvm/Kconfig
+++ b/arch/arm/kvm/Kconfig
@@ -21,6 +21,7 @@ config KVM
depends on MMU && OF
select PREEMPT_NOTIFIERS
select ANON_INODES
+ select ARM_GIC
select HAVE_KVM_CPU_RELAX_INTERCEPT
select HAVE_KVM_ARCH_TLB_FLUSH_ALL
select KVM_MMIO
diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S
index bd22b2c..d3161c7 100644
--- a/arch/arm/mach-at91/pm_suspend.S
+++ b/arch/arm/mach-at91/pm_suspend.S
@@ -81,6 +81,8 @@ tmp2 .req r5
* @r2: base address of second SDRAM Controller or 0 if not present
* @r3: pm information
*/
+/* at91_pm_suspend_in_sram must be 8-byte aligned per the requirements of fncpy() */
+ .align 3
ENTRY(at91_pm_suspend_in_sram)
/* Save registers on stack */
stmfd sp!, {r4 - r12, lr}
diff --git a/arch/arm/mach-pxa/include/mach/pxa27x.h b/arch/arm/mach-pxa/include/mach/pxa27x.h
index 599b925..1a42919 100644
--- a/arch/arm/mach-pxa/include/mach/pxa27x.h
+++ b/arch/arm/mach-pxa/include/mach/pxa27x.h
@@ -19,7 +19,7 @@
#define ARB_CORE_PARK (1<<24) /* Be parked with core when idle */
#define ARB_LOCK_FLAG (1<<23) /* Only Locking masters gain access to the bus */
-extern int __init pxa27x_set_pwrmode(unsigned int mode);
+extern int pxa27x_set_pwrmode(unsigned int mode);
extern void pxa27x_cpu_pm_enter(suspend_state_t state);
#endif /* __MACH_PXA27x_H */
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index af423a4..782e6b9 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -251,7 +251,7 @@ static struct clk_lookup pxa27x_clkregs[] = {
*/
static unsigned int pwrmode = PWRMODE_SLEEP;
-int __init pxa27x_set_pwrmode(unsigned int mode)
+int pxa27x_set_pwrmode(unsigned int mode)
{
switch (mode) {
case PWRMODE_SLEEP:
diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c
index fbe74c6..49d1110 100644
--- a/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@ -39,8 +39,8 @@ static struct platform_device wifi_rfkill_device = {
static struct gpiod_lookup_table wifi_gpio_lookup = {
.dev_id = "rfkill_gpio",
.table = {
- GPIO_LOOKUP_IDX("tegra-gpio", 25, NULL, 0, 0),
- GPIO_LOOKUP_IDX("tegra-gpio", 85, NULL, 1, 0),
+ GPIO_LOOKUP("tegra-gpio", 25, "reset", 0),
+ GPIO_LOOKUP("tegra-gpio", 85, "shutdown", 0),
{ },
},
};
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 6e4b9ff..64d7486 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1395,12 +1395,19 @@ static int arm_iommu_mmap_attrs(struct device *dev, struct vm_area_struct *vma,
unsigned long uaddr = vma->vm_start;
unsigned long usize = vma->vm_end - vma->vm_start;
struct page **pages = __iommu_get_pages(cpu_addr, attrs);
+ unsigned long nr_pages = PAGE_ALIGN(size) >> PAGE_SHIFT;
+ unsigned long off = vma->vm_pgoff;
vma->vm_page_prot = __get_dma_pgprot(attrs, vma->vm_page_prot);
if (!pages)
return -ENXIO;
+ if (off >= nr_pages || (usize >> PAGE_SHIFT) > nr_pages - off)
+ return -ENXIO;
+
+ pages += off;
+
do {
int ret = vm_insert_page(vma, uaddr, *pages++);
if (ret) {
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index f5b00f4..b8b6e22 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -499,7 +499,7 @@ void __init orion_ge00_switch_init(struct dsa_platform_data *d, int irq)
d->netdev = &orion_ge00.dev;
for (i = 0; i < d->nr_chips; i++)
- d->chip[i].host_dev = &orion_ge00_shared.dev;
+ d->chip[i].host_dev = &orion_ge_mvmdio.dev;
orion_switch_device.dev.platform_data = d;
platform_device_register(&orion_switch_device);
diff --git a/arch/arm/vdso/vdsomunge.c b/arch/arm/vdso/vdsomunge.c
index aedec81..f645527 100644
--- a/arch/arm/vdso/vdsomunge.c
+++ b/arch/arm/vdso/vdsomunge.c
@@ -45,7 +45,6 @@
* it does.
*/
-#include <byteswap.h>
#include <elf.h>
#include <errno.h>
#include <fcntl.h>
@@ -59,6 +58,16 @@
#include <sys/types.h>
#include <unistd.h>
+#define swab16(x) \
+ ((((x) & 0x00ff) << 8) | \
+ (((x) & 0xff00) >> 8))
+
+#define swab32(x) \
+ ((((x) & 0x000000ff) << 24) | \
+ (((x) & 0x0000ff00) << 8) | \
+ (((x) & 0x00ff0000) >> 8) | \
+ (((x) & 0xff000000) >> 24))
+
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
#define HOST_ORDER ELFDATA2LSB
#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
@@ -104,17 +113,17 @@ static void cleanup(void)
static Elf32_Word read_elf_word(Elf32_Word word, bool swap)
{
- return swap ? bswap_32(word) : word;
+ return swap ? swab32(word) : word;
}
static Elf32_Half read_elf_half(Elf32_Half half, bool swap)
{
- return swap ? bswap_16(half) : half;
+ return swap ? swab16(half) : half;
}
static void write_elf_word(Elf32_Word val, Elf32_Word *dst, bool swap)
{
- *dst = swap ? bswap_32(val) : val;
+ *dst = swap ? swab32(val) : val;
}
int main(int argc, char **argv)
diff --git a/arch/arm64/include/asm/cpuidle.h b/arch/arm64/include/asm/cpuidle.h
index 141b2fc..0f74f05 100644
--- a/arch/arm64/include/asm/cpuidle.h
+++ b/arch/arm64/include/asm/cpuidle.h
@@ -5,20 +5,16 @@
#ifdef CONFIG_CPU_IDLE
extern int arm_cpuidle_init(unsigned int cpu);
-extern int cpu_suspend(unsigned long arg);
+extern int arm_cpuidle_suspend(int index);
#else
static inline int arm_cpuidle_init(unsigned int cpu)
{
return -EOPNOTSUPP;
}
-static inline int cpu_suspend(unsigned long arg)
+static inline int arm_cpuidle_suspend(int index)
{
return -EOPNOTSUPP;
}
#endif
-static inline int arm_cpuidle_suspend(int index)
-{
More information about the unionfs-cvs
mailing list