Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync up with Linus #39

Merged
merged 375 commits into from
Feb 19, 2015
Merged
Changes from 1 commit
Commits
Show all changes
375 commits
Select commit Hold shift + click to select a range
4fb9bcc
alpha: macro whitespace fixes
mstsirkin Jan 6, 2015
295bb01
arm: macro whitespace fixes
mstsirkin Jan 6, 2015
967f0e5
arm64: macro whitespace fixes
mstsirkin Jan 6, 2015
d13beab
avr32: macro whitespace fixes
mstsirkin Jan 6, 2015
00eaf4c
cris: macro whitespace fixes
mstsirkin Jan 6, 2015
fc0ca0e
frv: macro whitespace fixes
mstsirkin Jan 6, 2015
0ab0660
m32r: macro whitespace fixes
mstsirkin Jan 6, 2015
e9e6d91
m68k: macro whitespace fixes
mstsirkin Jan 6, 2015
0e8a2eb
parisc: macro whitespace fixes
mstsirkin Jan 6, 2015
3237f28
sh: macro whitespace fixes
mstsirkin Jan 6, 2015
33a3dcc
xtensa: macro whitespace fixes
mstsirkin Jan 6, 2015
4b636ba
sparc64: nocheck uaccess coding style tweaks
mstsirkin Jan 6, 2015
0795cb1
sparc32: nocheck uaccess coding style tweaks
mstsirkin Jan 6, 2015
a1a9bec
dmaengine: k3: Fix duplicated function name and allmodconfig build
krzk Dec 29, 2014
10b3e22
dmaengine: k3: fix duplicate function definition
arndb Jan 13, 2015
2f56eaf
dmaengine: mmp-tdma: don't include mach/regs-icu.h
arndb Jan 13, 2015
3c20ba5
dmaengine: mmp-tdma: fix terminate_all return code
arndb Jan 13, 2015
640f204
dmaengine: drop owner assignment from platform_drivers
Jan 13, 2015
029a40e
dmaengine: dw: provide DMA capabilities
andy-shev Jan 2, 2015
ef9d2a9
dmaengine: mxs-dma: Declare slave capabilities for the generic code
Dec 29, 2014
1e4a4f5
dmaengine: imx-sdma: Declare slave capabilities for the generic code
Dec 29, 2014
7f24e0e
dmaengine: imx-sdma: Use devm functions
Dec 29, 2014
63c72e0
dmaengine: imx-sdma: Return a proper error code in platform_get_irq()
Dec 29, 2014
7a96337
dmaengine: rcar-hpbdma: fixup WARNING of slave caps retrieval
morimoto Jan 8, 2015
75dc177
dmaengine: fsldma: declare slave capabilities for the generic code
haokexin Jan 8, 2015
0fdd244
dmaengine: fsldma: remove the unused variable
haokexin Jan 8, 2015
891653a
dmaengine: tegra: add slave capabilities reporting
Jan 6, 2015
816070e
dmaengine: at_hdmac: declare slave capabilities
ldesroches Jan 6, 2015
643165c
Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linu…
arndb Jan 14, 2015
45c6a0c
mtd: spi-nor: fsl-qspi: support deep sleep mode for imx6 sx chip
Jan 12, 2015
526789f
mtd: nand: ams-delta: fix overwritten mtd_info->owner in initialization
mita Jan 11, 2015
69a559e
nandsim: remove unused STATE_DATAOUT_STATUS_M and OPT_SMARTMEDIA
mita Jan 11, 2015
0d5484b
dmaengine: Move dma_get_slave_caps() implementation to dmaengine.c
Oct 28, 2014
a0a51a6
dmaengine: sa11x0: Fix warning and compilation errors
mripard Jan 13, 2015
848e10b
dmaengine: s3c24xx: Fix typo
mripard Jan 13, 2015
4d76bbe
dmaengine: coh901318: fix function return types build warnings
arndb Jan 13, 2015
fdb8df9
dmaengine: Add dma_get_slave_caps() inline stub when !CONFIG_DMA_ENGINE
Jan 19, 2015
fcc87a9
mtd: spi-nor: support for (GigaDevice) GD25Q128B
rmilecki Dec 16, 2014
cfe4af3
mtd: fsl-quadspi: Fix module unbound
Jan 13, 2015
267d46e
mtd: atmel_nand: return max bitflips in all sectors in pmecc_correcti…
JoshWu Jan 14, 2015
5158577
mtd: atmel_nand: introduce a new compatible string for sama5d4 chip
JoshWu Jan 19, 2015
7f870c8
virtio_pci: drop virtio_config dependency
mstsirkin Dec 28, 2014
7754f53
virtio/9p: verify device has config space
mstsirkin Jan 12, 2015
a4379fd
virtio/blk: verify device has config space
mstsirkin Jan 12, 2015
011f0e7
virtio/console: verify device has config space
mstsirkin Jan 12, 2015
6ba4224
virtio/net: verify device has config space
mstsirkin Jan 12, 2015
8cab3cd
virtio/scsi: verify device has config space
mstsirkin Jan 12, 2015
2d9becc
virtio/balloon: verify device has config space
mstsirkin Jan 12, 2015
54cfe08
mn10300: drop dead code
mstsirkin Dec 14, 2014
eb29d8d
pci: add pci_iomap_range
mstsirkin May 29, 2013
8cfc99b
s390: add pci_iomap_range
mstsirkin May 29, 2013
2bd56af
virtio_pci: drop useless del_vqs call
sashalevin Jan 2, 2015
ff31d2e
virtio_pci: move probe/remove code to common
mstsirkin Jan 13, 2015
71d70c2
virtio-pci: define layout for virtio 1.0
rustyrussell May 29, 2013
1fcf051
virtio_pci: modern driver
mstsirkin Dec 11, 2014
89461c4
virtio_pci: macros for PCI layout offsets
rustyrussell May 30, 2013
3909213
virtio_pci_modern: reduce number of mappings
mstsirkin Jan 14, 2015
d3f5f06
virtio_pci_modern: support devices with no config
mstsirkin Jan 13, 2015
25e65e4
virtio_balloon: coding style fixes
mstsirkin Jan 15, 2015
bb6ec57
virtio_blk: coding style fixes
mstsirkin Jan 15, 2015
43b4f72
virtio_ring: coding style fix
mstsirkin Jan 15, 2015
3c73224
virtio_rng: drop extra empty line
mstsirkin Jan 15, 2015
b2a6d51
virtio_pci: Kconfig grammar fix
mstsirkin Jan 15, 2015
0327642
virtio_pci: drop Kconfig warnings
mstsirkin Jan 15, 2015
46506da
virtio_pci: add an option to disable legacy driver
mstsirkin Jan 15, 2015
ac399d8
virtio_pci: add module param to force legacy mode
mstsirkin Jan 15, 2015
76545f0
virtio_pci_modern: drop an unused function
mstsirkin Jan 20, 2015
240181f
mtd: nand: default bitflip-reporting threshold to 75% of correction s…
computersforpeace Jan 12, 2015
b625a82
firewire: ohci: Remove unused function
Jan 2, 2015
52a98dc
Merge tag 'mfd-fixes-3.19' into HEAD
Jan 22, 2015
0b27125
mfd: rt5033: Add Richtek RT5033 driver core.
Dec 9, 2014
6f262ec
mfd: sun6i-prcm: Add support for the ir-clk
jwrdegoede Dec 17, 2014
1ae68f9
mfd: db8500-prcmu: Remove unused function
Jan 1, 2015
b8fce55
mfd: Add support for DA9150 combined charger & fuel-gauge device
Dec 22, 2014
c68a865
mfd: lpc_sch: Enable WDT for Intel Quark X1000
elvinongbl Jan 14, 2015
ee231ae
mfd: dln2: Add start/stop RX URBs helpers
Jan 19, 2015
3daa122
mfd: dln2: Add suspend/resume functionality
Jan 19, 2015
fef22cb
mfd: wm8994: Set mfd id-base for regulator devs creation to avoid con…
Inha-Song Jan 8, 2015
774e0b4
mfd: axp20x: Add support for fuel gauge cell driver
tebrandt Jan 7, 2015
8da90cc
mfd: 88pm860x-core: Constify struct regmap_config
krzk Jan 5, 2015
7f9e3fe
mfd: hi6421-pmic: Constify struct regmap_config
krzk Jan 5, 2015
172cb30
mfd: intel_soc_pmic: Constify struct regmap_config
krzk Jan 5, 2015
68be231
mfd: max77686: Constify struct regmap_config
krzk Jan 5, 2015
dd63516
mfd: lm3533: Constify struct regmap_config
krzk Jan 5, 2015
1b33d5e
mfd: retu: Constify struct regmap_config
krzk Jan 5, 2015
1590d4a
mfd: pcf50633: Constify struct regmap_config
krzk Jan 5, 2015
b8d12ea
mfd: davinci_voicecodec: Constify struct regmap_config
krzk Jan 5, 2015
486212f
mfd: smsc-ece1099: Constify struct regmap_config
krzk Jan 5, 2015
18bb399
mfd: tps65218: Constify struct regmap_config
krzk Jan 5, 2015
18dd21a
mfd: mc13xxx: i2c/spi: Constify struct regmap_config
krzk Jan 5, 2015
af0a837
mfd: tps65217: Constify struct regmap_config
krzk Jan 5, 2015
d842b61
mfd: twl-core: Constify struct regmap_config and reg_default array
krzk Jan 5, 2015
de1e23f
mfd: twl6040: Constify struct regmap_config and reg_default array
krzk Jan 5, 2015
5dd6eeb
mfd: omap-usb-host: Remove some unused functions
Jan 4, 2015
2b50635
mfd: max77686/802: Remove support for board files
krzk Dec 29, 2014
aa0c4b8
mfd: devicetree: bindings: Add Qualcomm RPM DT binding
andersson Nov 26, 2014
58e2143
mfd: qcom-rpm: Driver for the Qualcomm RPM
andersson Nov 26, 2014
8039268
regulator: qcom-rpm: Add missing state flag in call to RPM
andersson Nov 26, 2014
71e03de
mfd: da9063: Add device tree support
Jan 20, 2015
c7f15d4
mfd: devicetree: Add bindings for DA9063
Jan 20, 2015
bb400d2
mfd: rtsx_usb: Defer autosuspend while card exists
roger-tttseng Jan 21, 2015
1862ee2
virtio-mmio: Update the device to OASIS spec version
pawelmoll Jan 23, 2015
2b5fbb8
dmaengine: rcar-hpbdma: tidyup residue_granularity
morimoto Jan 21, 2015
5cf5aec
dmaengine: shdmac: fixup WARNING of slave caps retrieval
morimoto Jan 22, 2015
c914570
dmaengine: of: bail out early if "dmas" property is not present
Jan 14, 2015
d2048c4
pwm: atmel-hlcdc: Depend on HAVE_CLK
thierryreding Dec 18, 2014
df6922a
pwm: atmel-hlcdc: Prevent division by zero
Dec 18, 2014
09853ce
pwm: Add Allwinner SoC support
alexandrebelloni Dec 17, 2014
ed73598
pwm: sunxi: document OF bindings
alexandrebelloni Dec 17, 2014
cd264b6
pwm: sti: Maintain a bitmap of configured devices
Jan 29, 2015
277bb6a
pwm: Imagination Technologies PWM DAC driver
tellapati Jan 9, 2015
9c959bf
pwm: Add device tree binding document for IMG PWM DAC
tellapati Jan 9, 2015
1f95f8c
firewire: sbp2: remove redundant check for bidi command
Jan 23, 2015
e0377cd
mtd: nand: Request strength instead of bytes for soft BCH
Jan 14, 2015
cd145af
mtd: nand: jz4740: Convert to GPIO descriptor API
larsclausen Dec 2, 2014
d71e6a1
firewire: core: use correct vendor/model IDs
cladisch Jan 28, 2015
2cd6f79
Merge branch 'topic/slave_caps_device_control_fix_rebased' into for-l…
Feb 3, 2015
46c2eb6
Merge branch 'topic/rcar' into for-linus
Feb 3, 2015
8d6cc07
pwm: Remove unnecessary check before of_node_put()
elfring Feb 3, 2015
1fb200d
dmaengine: dw: update MAINTAINERS file
andy-shev Jan 19, 2015
09aa8ac
dma: mmp_tdma: Fix build for ARM64
robherring Feb 3, 2015
68a8cc9
ioatdma: Adding support for BDX-DE ioatdma.
davejiang Jan 30, 2015
3028718
dmaengine: s3c24xx: missing unlock on an error path
Jan 30, 2015
91d457d
dmaengine: Add binding document for IMG MDC
abrestic Dec 11, 2014
5689ba7
dmaengine: Add driver for IMG MDC
abrestic Dec 11, 2014
a835bb8
dmatest: fix indentation
andy-shev Oct 22, 2014
ede23a5
dmatest: move src_off, dst_off, len inside loop
andy-shev Oct 22, 2014
cfd8fef
dmaengine: dw: amend description of dma_dev field
andy-shev Jan 13, 2015
d8ded50
dmaengine: dw: define DW_DMA_MAX_NR_MASTERS
andy-shev Jan 13, 2015
12385f4
ioat: fail self-test if wait_for_completion times out
hofrat Jan 8, 2015
cbb85e6
dmaengine: at_xdmac: wait for in-progress transaction to complete aft…
Jan 27, 2015
734bb9a
dmaengine: at_xdmac: introduce save_cc field
ldesroches Jan 27, 2015
be83507
dmaengine: at_xdmac: simplify channel configuration stuff
ldesroches Jan 27, 2015
6d3a7d9
dmaengine: at_xdmac: allow muliple dwidths when doing slave transfers
ldesroches Jan 27, 2015
0760e81
mtd: nand: omap: drop condition with no effect
Feb 4, 2015
e4ca684
mtd: fsl-quadspi: Fix the error paths
Jan 23, 2015
50131b7
mtd: fsl-quadspi: Remove unneeded success/error messages
Jan 23, 2015
b1ab474
mtd: fsl-quadspi: Remove unnecessary 'map_failed' label
Jan 23, 2015
4e898ce
mtd: fsl-quadspi: improve read performance by increase AHB transfer size
Jan 13, 2015
4d8e2ce
MAINTAINERS: add maintainer entry for FREESCALE QUAD SPI driver
Jan 15, 2015
2ea69d2
mtd: nand: remove redundant local variable
baruchsiach Jan 22, 2015
d79ee72
mtd: denali: remove unnecessary stubs
masahir0y Jan 13, 2015
be802bf
mtd: kconfig: replace PPC_OF with PPC
haokexin Jan 31, 2015
d164ea3
mtd: concat: set the return lengths properly
Jan 20, 2015
e1dd864
mtd: avoid registering reboot notifier twice
Feb 1, 2015
54f531f
mtd: hisilicon: add a new NAND controller driver for hisilicon hip04 Soc
Jan 25, 2015
72f55d7
mtd: hisilicon: add device tree binding documentation
Jan 25, 2015
0091b9d
dmaengine: pl330: fix bug that cause start the same descs in cyclic
addyke Dec 8, 2014
5e05bf5
virtio: Avoid possible kernel panic if DEBUG is enabled.
Feb 11, 2015
e6a0274
virtio: define VIRTIO_PCI_CAP_PCI_CFG in header.
rustyrussell Feb 11, 2015
527100a
virtio: Don't expose legacy block features when VIRTIO_BLK_NO_LEGACY …
rustyrussell Feb 11, 2015
6d96ee9
virtio: Don't expose legacy config features when VIRTIO_CONFIG_NO_LEG…
rustyrussell Feb 11, 2015
7abb568
virtio_pci: use 16-bit accessor for queue_enable.
rustyrussell Feb 11, 2015
be8ff59
virtio: don't require a config space on the console device.
rustyrussell Feb 11, 2015
a454bb3
lguest: have --rng read from /dev/urandom not /dev/random.
rustyrussell Feb 11, 2015
18c1373
lguest: add operations to get/set a register from the Launcher.
rustyrussell Feb 11, 2015
69a09dc
lguest: write more information to userspace about pending traps.
rustyrussell Feb 11, 2015
8ed3130
lguest: add infrastructure for userspace to deliver a trap to the guest.
rustyrussell Feb 11, 2015
c9e433e
lguest: add infrastructure to check mappings.
rustyrussell Feb 11, 2015
c565650
lguest: send trap 13 through to userspace.
rustyrussell Feb 11, 2015
48fd6b7
lguest: suppress PS/2 keyboard polling.
rustyrussell Feb 11, 2015
d1c2946
lguest: don't disable iospace.
rustyrussell Feb 11, 2015
7313d52
lguest: add iomem region, where guest page faults get sent to userspace.
rustyrussell Feb 11, 2015
ee72576
lguest: disable ACPI explicitly.
rustyrussell Feb 11, 2015
e1b83e2
lguest: Override pcibios_enable_irq/pcibios_disable_irq to our stupid…
rustyrussell Feb 11, 2015
0a6bcc1
lguest: add MMIO region allocator in example launcher.
rustyrussell Feb 11, 2015
6a54f9a
lguest: decode mmio accesses for PCI in example launcher.
rustyrussell Feb 11, 2015
d7fbf6e
lguest: add PCI config space emulation to example launcher.
rustyrussell Feb 11, 2015
9315307
lguest: implement virtio-PCI MMIO accesses.
rustyrussell Feb 11, 2015
3e0e5f2
lguest: fix failure to find linux/virtio_types.h
rustyrussell Feb 11, 2015
8e70946
lguest: add a dummy PCI host bridge.
rustyrussell Feb 11, 2015
5051654
lguest: Convert block device to virtio 1.0 PCI.
rustyrussell Feb 11, 2015
bf6d403
lguest: Convert net device to virtio 1.0 PCI.
rustyrussell Feb 11, 2015
0d5b5d3
lguest: Convert entropy device to virtio 1.0 PCI.
rustyrussell Feb 11, 2015
ebff011
lguest: Convert console device to virtio 1.0 PCI.
rustyrussell Feb 11, 2015
eb39f83
lguest: define VIRTIO_CONFIG_NO_LEGACY in example launcher.
rustyrussell Feb 11, 2015
e68ccd1
lguest: remove support for lguest bus.
rustyrussell Feb 11, 2015
d9028ed
lguest: remove support for lguest bus in demonstration launcher.
rustyrussell Feb 11, 2015
b3e28b6
lguest: remove lguest bus definitions from header.
rustyrussell Feb 11, 2015
e8330d9
lguest: support emerg_wr in console device in example launcher.
rustyrussell Feb 11, 2015
59eba78
lguest: support backdoor window.
rustyrussell Feb 11, 2015
713e3f7
lguest: always put console in PCI slot #1.
rustyrussell Feb 11, 2015
a561adf
lguest: use the PCI console device's emerg_wr for early boot messages.
rustyrussell Feb 11, 2015
00f8d54
lguest: remove NOTIFY facility from demonstration launcher.
rustyrussell Feb 11, 2015
d9bab50
lguest: remove NOTIFY call and eventfd facility.
rustyrussell Feb 11, 2015
feb2897
of/pci: Remove duplicate kfree in of_pci_get_host_bridge_resources()
Feb 11, 2015
82bf90c
dmaengine: shdmac: use SET_RUNTIME_PM_OPS()
Jan 20, 2015
bf44a41
dmaengine: shdmac: extend PM methods
Jan 20, 2015
a55e07c
dmaengine: rcar-dmac: Fix uninitialized variable usage
Jan 8, 2015
a2e1999
virtual: Documentation: simplify and generalize paravirt_ops.txt
mcgrof Feb 13, 2015
d2dbdac
tools/lguest: handle device reset correctly in example launcher.
rustyrussell Feb 13, 2015
53aceb4
tools/lguest: fix features_accepted logic in example launcher.
rustyrussell Feb 13, 2015
b2ce1ea
tools/lguest: rename virtio_pci_cfg_cap field to match spec.
rustyrussell Feb 13, 2015
8dc425f
tools/lguest: insert device references from the 1.0 spec (4.1 Virtio …
rustyrussell Feb 13, 2015
c97eb67
tools/lguest: insert driver references from the 1.0 spec (4.1 Virtio …
rustyrussell Feb 13, 2015
3afe3e0
tools/lguest: handle indirect partway through chain.
rustyrussell Feb 13, 2015
d761b03
tools/lguest: don't start devices until DRIVER_OK status set.
rustyrussell Feb 13, 2015
55c2d78
lguest: don't look in console features to find emerg_wr.
rustyrussell Feb 13, 2015
d39a678
tools/lguest: more documentation and checking of virtio 1.0 compliance.
rustyrussell Feb 13, 2015
17c56d6
tools/lguest: give virtqueues names for better error messages
rustyrussell Feb 13, 2015
1e1c17a
tools/lguest: use common error macros in the example launcher.
rustyrussell Feb 13, 2015
ed9ecb0
virtio: Don't expose legacy net features when VIRTIO_NET_NO_LEGACY de…
rustyrussell Feb 13, 2015
206ad06
tools/lguest: don't use legacy definitions for net device in example …
rustyrussell Feb 13, 2015
164c240
jffs2: fix handling of corrupted summary length
Feb 10, 2015
dd58d38
mtd: hisilicon: && vs & typo
Feb 11, 2015
b7a4fd5
dmaenegine: edma: fix sparse warnings
prabhakarlad Feb 4, 2015
f391507
dmaengine: rcar-dmac: Fix spinlock issues in interrupt
Jan 27, 2015
f7638c9
dmaengine: rcar-dmac: Fix oops due to unintialized list in error ISR
Jan 27, 2015
6a63480
dmaengine: rcar-dmac: Allocate hardware descriptors with DMAC device
Jan 27, 2015
3f46306
dmaengine: rcar-dmac: Work around descriptor mode IOMMU errata
Jan 27, 2015
be6893e
dmaengine: rcar-dmac: Disable channel 0 when using IOMMU
Jan 27, 2015
aee4d1f
dmaengine: pl330: improve pl330_tx_status() function
Feb 11, 2015
88987d2
dmaengine: pl330: add DMA_PAUSE feature
Feb 11, 2015
0a65fbf
mfd: intel_soc_pmic: Add missing error check for devm_kzalloc
KiranPadwal Feb 11, 2015
e084c1b
Revert "locks: keep a count of locks on the flctx lists"
Feb 16, 2015
eb928d4
Merge JFFS2 updates from David Woodhouse
computersforpeace Feb 17, 2015
e68c48f
virtio_net: unconditionally define struct virtio_net_hdr_v1.
rustyrussell Feb 17, 2015
5b40a7d
virtio: don't set VIRTIO_CONFIG_S_DRIVER_OK twice.
rustyrussell Feb 17, 2015
c4e136c
locks: only remove leases associated with the file being closed
Feb 17, 2015
267f112
locks: remove conditional lock release in middle of flock_lock_file
Feb 17, 2015
9393766
watchdog: ImgTec PDC Watchdog Timer Driver
tellapati Jan 6, 2015
1888e7a
DT: watchdog: Add ImgTec PDC Watchdog Timer binding documentation
tellapati Jan 6, 2015
4bd8ce3
watchdog: imx2: Constify struct regmap_config and watchdog_ops
krzk Jan 5, 2015
f83918f
watchdog: it87_wdt: add IT8783 ID
paoloteti Oct 19, 2014
b91b5be
watchdog: hpwdt: Fix initialization message in hpwdt.c
standby24x7 Oct 22, 2014
a6f8f81
watchdog: rt2880_wdt: minor clean up
Oct 16, 2014
fb1cbea
watchdog: Fix omap watchdogs to enable the magic close bit
tmlind Oct 14, 2014
a44a455
watchdog: Add driver for Mediatek watchdog
mbgg Jan 13, 2015
9a4c880
ARM: mediatek: dts: Add bindings for watchdog
mbgg Jan 13, 2015
396f163
watchdog: da9063: Add restart handler support
geertu Jan 29, 2015
ba804a9
watchdog: gpio_wdt: Add "always_running" feature to GPIO watchdog
MikeLooijmans Jan 14, 2015
1cc7495
watchdog: bcm47xx_wdt.c: add restart handler support
rmilecki Jan 25, 2015
a77841d
watchdog: w83627hf_wdt: Add support for NCT6791 and NCT6792
groeck Jan 26, 2015
a008501
watchdog: dw_wdt: pat the watchdog before enabling it
dianders Jan 27, 2015
b5ade9b
watchdog: dw_wdt: Try to get a 30 second watchdog by default
dianders Jan 27, 2015
73af152
dt: watchdog: Add DT binding documentation for jz4740 watchdog timer
Feb 3, 2015
6b96c72
watchdog: jz4740: Add DT support
Feb 3, 2015
9461343
watchdog: bcm47xx_wdt.c: allow enabling on BCM5301X arch
rmilecki Feb 7, 2015
2e2f756
locks: fix list insertion when lock is split in two
Feb 17, 2015
b65af27
pwm: tegra: Use NSEC_PER_SEC
thierryreding Feb 18, 2015
402521b
Merge tag 'for-linus-20150216' of git://git.infradead.org/linux-mtd
torvalds Feb 18, 2015
a5ac1fb
Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/ke…
torvalds Feb 18, 2015
928fce2
Merge git://www.linux-watchdog.org/linux-watchdog
torvalds Feb 18, 2015
ce1d3fd
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave…
torvalds Feb 18, 2015
9a8b2aa
Merge tag 'pwm/for-3.20-rc1' of git://git.kernel.org/pub/scm/linux/ke…
torvalds Feb 18, 2015
5c27700
Merge tag 'mfd-for-linus-3.20' of git://git.kernel.org/pub/scm/linux/…
torvalds Feb 18, 2015
53861af
Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/lin…
torvalds Feb 18, 2015
cad3ab5
Merge tag 'pci-v3.20-fixes-1' of git://git.kernel.org/pub/scm/linux/k…
torvalds Feb 18, 2015
eaa0eda
Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/lin…
torvalds Feb 18, 2015
b2b89eb
Merge tag 'locks-v3.20-2' of git://git.samba.org/jlayton/linux
torvalds Feb 18, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
arm: macro whitespace fixes
While working on arch/arm/include/asm/uaccess.h, I noticed
that some macros within this header are made harder to read because they
violate a coding style rule: space is missing after comma.

Fix it up.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
mstsirkin committed Jan 13, 2015
commit 295bb01e2666e450be7f6e6e1f5785bfb26fd60e
92 changes: 46 additions & 46 deletions arch/arm/include/asm/uaccess.h
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ static inline void set_fs(mm_segment_t fs)
modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
}

#define segment_eq(a,b) ((a) == (b))
#define segment_eq(a, b) ((a) == (b))

#define __addr_ok(addr) ({ \
unsigned long flag; \
@@ -84,7 +84,7 @@ static inline void set_fs(mm_segment_t fs)
(flag == 0); })

/* We use 33-bit arithmetic here... */
#define __range_ok(addr,size) ({ \
#define __range_ok(addr, size) ({ \
unsigned long flag, roksum; \
__chk_user_ptr(addr); \
__asm__("adds %1, %2, %3; sbcccs %1, %1, %0; movcc %0, #0" \
@@ -123,7 +123,7 @@ extern int __get_user_64t_4(void *);
#define __GUP_CLOBBER_32t_8 "lr", "cc"
#define __GUP_CLOBBER_8 "lr", "cc"

#define __get_user_x(__r2,__p,__e,__l,__s) \
#define __get_user_x(__r2, __p, __e, __l, __s) \
__asm__ __volatile__ ( \
__asmeq("%0", "r0") __asmeq("%1", "r2") \
__asmeq("%3", "r1") \
@@ -134,7 +134,7 @@ extern int __get_user_64t_4(void *);

/* narrowing a double-word get into a single 32bit word register: */
#ifdef __ARMEB__
#define __get_user_x_32t(__r2, __p, __e, __l, __s) \
#define __get_user_x_32t(__r2, __p, __e, __l, __s) \
__get_user_x(__r2, __p, __e, __l, 32t_8)
#else
#define __get_user_x_32t __get_user_x
@@ -158,7 +158,7 @@ extern int __get_user_64t_4(void *);
#endif


#define __get_user_check(x,p) \
#define __get_user_check(x, p) \
({ \
unsigned long __limit = current_thread_info()->addr_limit - 1; \
register const typeof(*(p)) __user *__p asm("r0") = (p);\
@@ -196,18 +196,18 @@ extern int __get_user_64t_4(void *);
__e; \
})

#define get_user(x,p) \
#define get_user(x, p) \
({ \
might_fault(); \
__get_user_check(x,p); \
__get_user_check(x, p); \
})

extern int __put_user_1(void *, unsigned int);
extern int __put_user_2(void *, unsigned int);
extern int __put_user_4(void *, unsigned int);
extern int __put_user_8(void *, unsigned long long);

#define __put_user_x(__r2,__p,__e,__l,__s) \
#define __put_user_x(__r2, __p, __e, __l, __s) \
__asm__ __volatile__ ( \
__asmeq("%0", "r0") __asmeq("%2", "r2") \
__asmeq("%3", "r1") \
@@ -216,7 +216,7 @@ extern int __put_user_8(void *, unsigned long long);
: "0" (__p), "r" (__r2), "r" (__l) \
: "ip", "lr", "cc")

#define __put_user_check(x,p) \
#define __put_user_check(x, p) \
({ \
unsigned long __limit = current_thread_info()->addr_limit - 1; \
const typeof(*(p)) __user *__tmp_p = (p); \
@@ -242,10 +242,10 @@ extern int __put_user_8(void *, unsigned long long);
__e; \
})

#define put_user(x,p) \
#define put_user(x, p) \
({ \
might_fault(); \
__put_user_check(x,p); \
__put_user_check(x, p); \
})

#else /* CONFIG_MMU */
@@ -255,21 +255,21 @@ extern int __put_user_8(void *, unsigned long long);
*/
#define USER_DS KERNEL_DS

#define segment_eq(a,b) (1)
#define __addr_ok(addr) ((void)(addr),1)
#define __range_ok(addr,size) ((void)(addr),0)
#define segment_eq(a, b) (1)
#define __addr_ok(addr) ((void)(addr), 1)
#define __range_ok(addr, size) ((void)(addr), 0)
#define get_fs() (KERNEL_DS)

static inline void set_fs(mm_segment_t fs)
{
}

#define get_user(x,p) __get_user(x,p)
#define put_user(x,p) __put_user(x,p)
#define get_user(x, p) __get_user(x, p)
#define put_user(x, p) __put_user(x, p)

#endif /* CONFIG_MMU */

#define access_ok(type,addr,size) (__range_ok(addr,size) == 0)
#define access_ok(type, addr, size) (__range_ok(addr, size) == 0)

#define user_addr_max() \
(segment_eq(get_fs(), KERNEL_DS) ? ~0UL : get_fs())
@@ -283,35 +283,35 @@ static inline void set_fs(mm_segment_t fs)
* error occurs, and leave it unchanged on success. Note that these
* versions are void (ie, don't return a value as such).
*/
#define __get_user(x,ptr) \
#define __get_user(x, ptr) \
({ \
long __gu_err = 0; \
__get_user_err((x),(ptr),__gu_err); \
__get_user_err((x), (ptr), __gu_err); \
__gu_err; \
})

#define __get_user_error(x,ptr,err) \
#define __get_user_error(x, ptr, err) \
({ \
__get_user_err((x),(ptr),err); \
__get_user_err((x), (ptr), err); \
(void) 0; \
})

#define __get_user_err(x,ptr,err) \
#define __get_user_err(x, ptr, err) \
do { \
unsigned long __gu_addr = (unsigned long)(ptr); \
unsigned long __gu_val; \
__chk_user_ptr(ptr); \
might_fault(); \
switch (sizeof(*(ptr))) { \
case 1: __get_user_asm_byte(__gu_val,__gu_addr,err); break; \
case 2: __get_user_asm_half(__gu_val,__gu_addr,err); break; \
case 4: __get_user_asm_word(__gu_val,__gu_addr,err); break; \
case 1: __get_user_asm_byte(__gu_val, __gu_addr, err); break; \
case 2: __get_user_asm_half(__gu_val, __gu_addr, err); break; \
case 4: __get_user_asm_word(__gu_val, __gu_addr, err); break; \
default: (__gu_val) = __get_user_bad(); \
} \
(x) = (__typeof__(*(ptr)))__gu_val; \
} while (0)

#define __get_user_asm_byte(x,addr,err) \
#define __get_user_asm_byte(x, addr, err) \
__asm__ __volatile__( \
"1: " TUSER(ldrb) " %1,[%2],#0\n" \
"2:\n" \
@@ -330,15 +330,15 @@ do { \
: "cc")

#ifndef __ARMEB__
#define __get_user_asm_half(x,__gu_addr,err) \
#define __get_user_asm_half(x, __gu_addr, err) \
({ \
unsigned long __b1, __b2; \
__get_user_asm_byte(__b1, __gu_addr, err); \
__get_user_asm_byte(__b2, __gu_addr + 1, err); \
(x) = __b1 | (__b2 << 8); \
})
#else
#define __get_user_asm_half(x,__gu_addr,err) \
#define __get_user_asm_half(x, __gu_addr, err) \
({ \
unsigned long __b1, __b2; \
__get_user_asm_byte(__b1, __gu_addr, err); \
@@ -347,7 +347,7 @@ do { \
})
#endif

#define __get_user_asm_word(x,addr,err) \
#define __get_user_asm_word(x, addr, err) \
__asm__ __volatile__( \
"1: " TUSER(ldr) " %1,[%2],#0\n" \
"2:\n" \
@@ -365,35 +365,35 @@ do { \
: "r" (addr), "i" (-EFAULT) \
: "cc")

#define __put_user(x,ptr) \
#define __put_user(x, ptr) \
({ \
long __pu_err = 0; \
__put_user_err((x),(ptr),__pu_err); \
__put_user_err((x), (ptr), __pu_err); \
__pu_err; \
})

#define __put_user_error(x,ptr,err) \
#define __put_user_error(x, ptr, err) \
({ \
__put_user_err((x),(ptr),err); \
__put_user_err((x), (ptr), err); \
(void) 0; \
})

#define __put_user_err(x,ptr,err) \
#define __put_user_err(x, ptr, err) \
do { \
unsigned long __pu_addr = (unsigned long)(ptr); \
__typeof__(*(ptr)) __pu_val = (x); \
__chk_user_ptr(ptr); \
might_fault(); \
switch (sizeof(*(ptr))) { \
case 1: __put_user_asm_byte(__pu_val,__pu_addr,err); break; \
case 2: __put_user_asm_half(__pu_val,__pu_addr,err); break; \
case 4: __put_user_asm_word(__pu_val,__pu_addr,err); break; \
case 8: __put_user_asm_dword(__pu_val,__pu_addr,err); break; \
case 1: __put_user_asm_byte(__pu_val, __pu_addr, err); break; \
case 2: __put_user_asm_half(__pu_val, __pu_addr, err); break; \
case 4: __put_user_asm_word(__pu_val, __pu_addr, err); break; \
case 8: __put_user_asm_dword(__pu_val, __pu_addr, err); break; \
default: __put_user_bad(); \
} \
} while (0)

#define __put_user_asm_byte(x,__pu_addr,err) \
#define __put_user_asm_byte(x, __pu_addr, err) \
__asm__ __volatile__( \
"1: " TUSER(strb) " %1,[%2],#0\n" \
"2:\n" \
@@ -411,22 +411,22 @@ do { \
: "cc")

#ifndef __ARMEB__
#define __put_user_asm_half(x,__pu_addr,err) \
#define __put_user_asm_half(x, __pu_addr, err) \
({ \
unsigned long __temp = (__force unsigned long)(x); \
__put_user_asm_byte(__temp, __pu_addr, err); \
__put_user_asm_byte(__temp >> 8, __pu_addr + 1, err); \
})
#else
#define __put_user_asm_half(x,__pu_addr,err) \
#define __put_user_asm_half(x, __pu_addr, err) \
({ \
unsigned long __temp = (__force unsigned long)(x); \
__put_user_asm_byte(__temp >> 8, __pu_addr, err); \
__put_user_asm_byte(__temp, __pu_addr + 1, err); \
})
#endif

#define __put_user_asm_word(x,__pu_addr,err) \
#define __put_user_asm_word(x, __pu_addr, err) \
__asm__ __volatile__( \
"1: " TUSER(str) " %1,[%2],#0\n" \
"2:\n" \
@@ -451,7 +451,7 @@ do { \
#define __reg_oper1 "%R2"
#endif

#define __put_user_asm_dword(x,__pu_addr,err) \
#define __put_user_asm_dword(x, __pu_addr, err) \
__asm__ __volatile__( \
ARM( "1: " TUSER(str) " " __reg_oper1 ", [%1], #4\n" ) \
ARM( "2: " TUSER(str) " " __reg_oper0 ", [%1]\n" ) \
@@ -480,9 +480,9 @@ extern unsigned long __must_check __copy_to_user_std(void __user *to, const void
extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
#else
#define __copy_from_user(to,from,n) (memcpy(to, (void __force *)from, n), 0)
#define __copy_to_user(to,from,n) (memcpy((void __force *)to, from, n), 0)
#define __clear_user(addr,n) (memset((void __force *)addr, 0, n), 0)
#define __copy_from_user(to, from, n) (memcpy(to, (void __force *)from, n), 0)
#define __copy_to_user(to, from, n) (memcpy((void __force *)to, from, n), 0)
#define __clear_user(addr, n) (memset((void __force *)addr, 0, n), 0)
#endif

static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)