Linus Torvalds
0429fbc0bd
Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu ...
Pull percpu consistent-ops changes from Tejun Heo:
"Way back, before the current percpu allocator was implemented, static
and dynamic percpu memory areas were allocated and handled separately
and had their own accessors. The distinction has been gone for many
years now; however, the now duplicate two sets of accessors remained
with the pointer based ones - this_cpu_*() - evolving various other
operations over time. During the process, we also accumulated other
inconsistent operations.
This pull request contains Christoph's patches to clean up the
duplicate accessor situation. __get_cpu_var() uses are replaced with
with this_cpu_ptr() and __this_cpu_ptr() with raw_cpu_ptr().
Unfortunately, the former sometimes is tricky thanks to C being a bit
messy with the distinction between lvalues and pointers, which led to
a rather ugly solution for cpumask_var_t involving the introduction of
this_cpu_cpumask_var_ptr().
This converts most of the uses but not all. Christoph will follow up
with the remaining conversions in this merge window and hopefully
remove the obsolete accessors"
* 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (38 commits)
irqchip: Properly fetch the per cpu offset
percpu: Resolve ambiguities in __get_cpu_var/cpumask_var_t -fix
ia64: sn_nodepda cannot be assigned to after this_cpu conversion. Use __this_cpu_write.
percpu: Resolve ambiguities in __get_cpu_var/cpumask_var_t
Revert "powerpc: Replace __get_cpu_var uses"
percpu: Remove __this_cpu_ptr
clocksource: Replace __this_cpu_ptr with raw_cpu_ptr
sparc: Replace __get_cpu_var uses
avr32: Replace __get_cpu_var with __this_cpu_write
blackfin: Replace __get_cpu_var uses
tile: Use this_cpu_ptr() for hardware counters
tile: Replace __get_cpu_var uses
powerpc: Replace __get_cpu_var uses
alpha: Replace __get_cpu_var
ia64: Replace __get_cpu_var uses
s390: cio driver &__get_cpu_var replacements
s390: Replace __get_cpu_var uses
mips: Replace __get_cpu_var uses
MIPS: Replace __get_cpu_var uses in FPU emulator.
arm: Replace __this_cpu_ptr with raw_cpu_ptr
...
2014-10-15 07:48:18 +02:00
spi: pl022: Add support for chip select extension
2014-09-24 10:25:52 +01:00
bcma: register bcma as device tree driver
2014-09-30 13:17:14 -04:00
libceph: sync osd op definitions in rados.h
2014-10-14 12:57:02 -07:00
The clk tree changes for 3.18 are dominated by clock drivers. Mostly
2014-10-15 07:05:03 +02:00
extcon: gpio: Fix code cleanup
2014-09-22 16:48:47 +09:00
fsl /bestcomm
This is the bulk of GPIO changes for the v3.18 development
2014-10-09 14:58:15 -04:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-09 06:42:04 -04:00
lockd: rip out deferred lock handling from testlock codepath
2014-09-09 16:01:09 -04:00
Changes to existing drivers:
2014-10-15 06:58:16 +02:00
net/mlx4_en: Code cleanups in tx path
2014-10-06 01:04:15 -04:00
net/mlx5_core: Identify resources by their type
2014-10-03 15:42:32 -07:00
mmc: sdhci: Add quirk for always getting TC with stop cmd
2014-10-03 14:18:17 +02:00
netfilter: ipset: send nonzero skbinfo extensions only
2014-09-15 22:20:21 +02:00
pinctrl: generic: Fix PIN_CONFIG_DRIVE_OPEN_SOURCE source/drain doc mismatch
2014-09-04 19:21:45 +02:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-10-14 09:39:08 +02:00
Merge remote-tracking branches 'regulator/topic/tps65217', 'regulator/topic/tps65910' and 'regulator/topic/voltage-ev' into regulator-next
2014-09-30 13:50:31 +01:00
soc /ti
drivers/soc: ti: fix build break with modules
2014-09-24 11:53:39 -07:00
This is the bulk of GPIO changes for the v3.18 development
2014-10-09 14:58:15 -04:00
Merge branch 'for-3.18' of git://linux-nfs.org/~bfields/linux
2014-10-08 12:51:44 -04:00
usb: hcd: add generic PHY support
2014-09-29 11:54:02 -04:00
ACPI / PM: Convert acpi_dev_pm_detach() into a static function
2014-09-22 15:57:41 +02:00
PCI/AER: Make <linux/aer.h> standalone includable
2014-09-16 16:28:34 -06:00
mmc: include linux/types.h for bool definition in atmel-mci.h
2014-09-09 13:58:58 +02:00
ARM: at91/tclib: mask interruptions at shutdown and probe
2014-09-08 10:54:03 +02:00
mm/balloon_compaction: add vmstat counters and kpageflags bit
2014-10-09 22:26:01 -04:00
blk-mq, percpu_ref: start q->mq_usage_counter in atomic mode
2014-09-24 13:37:21 -04:00
include/linux/blkdev.h: use NULL instead of zero
2014-10-09 22:26:04 -04:00
bpf: verifier (add verifier core)
2014-09-26 15:05:15 -04:00
net: phy: add BCM7425 and BCM7429 PHYs
2014-10-01 22:12:48 -04:00
crypto: ccp - Check for CCP before registering crypto algs
2014-09-24 14:23:34 +08:00
cgroup: remove CGRP_RELEASABLE flag
2014-09-19 09:29:32 -04:00
Allwinner Clocks Additions for 3.18
2014-09-27 12:52:33 -07:00
Allwinner Clocks Additions for 3.18
2014-09-27 12:52:33 -07:00
The clk tree changes for 3.18 are dominated by clock drivers. Mostly
2014-10-15 07:05:03 +02:00
drivers: dma-contiguous: add initialization from device tree
2014-10-14 02:18:12 +02:00
ARCNET: add support for multi interfaces on com20020
2014-09-29 14:36:26 -04:00
mm, compaction: khugepaged should not give up due to need_resched()
2014-10-09 22:25:54 -04:00
kernel: add support for gcc 5
2014-10-14 02:18:12 +02:00
rcu: Eliminate deadlock between CPU hotplug and expedited grace periods
2014-09-18 16:22:27 -07:00
cpufreq: Add support for per-policy driver data
2014-09-09 01:44:40 +02:00
Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2014-10-10 07:24:40 -04:00
don't need that forward declaration of struct nameidata in dcache.h anymore
2014-10-12 17:09:06 -04:00
device coredump: add new device coredump class
2014-09-23 22:53:15 -07:00
IOMMU Updates for Linux v3.18
2014-10-15 07:23:49 +02:00
dmaengine-3.17
2014-10-07 20:39:25 -04:00
iommu/vt-d: Store bus information in RMRR PCI device path
2014-10-02 12:12:25 +02:00
dynamic_debug: change __dynamic_<foo>_dbg return types to void
2014-10-03 14:55:48 -07:00
dql: dql_queued() should write first to reduce bus transactions
2014-09-29 00:04:55 -04:00
net: Add function for parsing the header length out of linear ethernet frames
2014-09-05 17:47:02 -07:00
ethtool: Add generic options for tunables
2014-09-05 12:12:20 -07:00
f2fs: support large sector size
2014-09-23 11:10:20 -07:00
bpf: handle pseudo BPF_LD_IMM64 insn
2014-09-26 15:05:15 -04:00
proportions: add @gfp to init functions
2014-09-08 09:51:30 +09:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-10-13 11:28:42 +02:00
net: fs_enet: Remove non NAPI RX
2014-10-08 16:01:41 -04:00
fsl_ifc: Fix csor_ext position in fsl_ifc_regs
2014-09-03 18:02:55 -05:00
ftrace: Replace tramp_hash with old_*_hash to save space
2014-09-10 10:48:45 -04:00
lib/genalloc.c: add genpool range check function
2014-10-09 22:25:52 -04:00
mm: rename allocflags_to_migratetype for clarity
2014-10-09 22:25:55 -04:00
Make hash_64() use a 64-bit multiply when appropriate
2014-09-13 11:24:03 -07:00
Merge branches 'for-3.18/always-poll-quirk', 'for-3.18/logitech', 'for-3.18/picolcd', 'for-3.18/rmi', 'for-3.18/sony', 'for-3.18/uhid', 'for-3.18/upstream' and 'for-3.18/wacom' into for-linus
2014-10-06 23:34:40 +02:00
mm: convert a few VM_BUG_ON callers to VM_BUG_ON_VMA
2014-10-09 22:25:57 -04:00
i2c: move acpi code back into the core
2014-09-25 16:07:15 +02:00
cfg80211: add WMM traffic stream API
2014-09-11 12:21:18 +02:00
macvlan: add source mode
2014-09-29 15:37:01 -04:00
ipv4: implement igmp_qrv sysctl to tune igmp robustness variable
2014-09-04 22:26:14 -07:00
ima: pass 'opened' flag to identify newly created files
2014-09-09 10:28:43 -04:00
rcu: Remove local_irq_disable() in rcu_preempt_note_context_switch()
2014-09-07 16:27:34 -07:00
genirq: Simplify wakeup mechanism
2014-09-01 13:48:59 +02:00
IOMMU Updates for Linux v3.18
2014-10-15 07:23:49 +02:00
resources: Add device-managed request/release_resource()
2014-09-04 14:41:43 -06:00
ipack: save carrier owner to allow device to get it
2014-09-23 23:13:13 -07:00
genirq: Mark wakeup sources as armed on suspend
2014-09-01 13:48:51 +02:00
irq_work: Force raised irq work to run on irq work interrupt
2014-09-13 18:38:15 +02:00
ACPI and power management updates for 3.18-rc1
2014-10-09 16:07:43 -04:00
jiffies: Fix timeval conversion to jiffies
2014-09-12 13:59:03 -07:00
include/linux: remove strict_strto* definitions
2014-10-14 02:18:26 +02:00
kexec: take the segment adding out of locate_mem_hole functions
2014-10-14 02:18:21 +02:00
KEYS: Make the key matching functions return bool
2014-09-16 17:36:08 +01:00
Documentation: Docbook: Fix generated DocBook/kernel-api.xml
2014-09-09 10:34:56 +02:00
Changes for KVM for arm/arm64 for 3.18
2014-09-27 11:03:33 +02:00
Revert "leds: convert blink timer to workqueue"
2014-09-02 10:02:13 -07:00
libata: change ata_<foo>_printk routines to return void
2014-09-23 10:02:31 -04:00
list: include linux/kernel.h
2014-10-14 02:18:13 +02:00
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-13 15:51:40 +02:00
mei: remove include to pci header from mei module files
2014-09-29 11:56:02 -04:00
memcg: move memcg_update_cache_size() to slab_common.c
2014-10-09 22:25:59 -04:00
memory-hotplug: add sysfs valid_zones attribute
2014-10-09 22:25:52 -04:00
mempolicy: unexport get_vma_policy() and remove its "task" arg
2014-10-09 22:25:56 -04:00
net/phy: micrel: Add clock support for KSZ8021/KSZ8031
2014-10-10 15:35:13 -04:00
mm/balloon_compaction: redesign ballooned pages management
2014-10-09 22:26:01 -04:00
mm: softdirty: enable write notifications on VMAs after VM_SOFTDIRTY cleared
2014-10-14 02:18:28 +02:00
mm: introduce VM_BUG_ON_MM
2014-10-09 22:25:58 -04:00
kvm: Fix page ageing bugs
2014-09-24 14:07:58 +02:00
mm: clean up zone flags
2014-10-09 22:25:57 -04:00
kernel/param: consolidate __{start,stop}___param[] in <linux/moduleparam.h>
2014-10-14 02:18:28 +02:00
PCI/MSI: Remove "pos" from the struct msi_desc msi_attrib
2014-10-01 12:21:23 -06:00
net: add netdev_txq_bql_{enqueue, complete}_prefetchw() helpers
2014-10-08 16:08:04 -04:00
netfilter: bridge: move br_netfilter out of the core
2014-09-26 18:42:31 +02:00
NFSD: Implement SEEK
2014-09-29 14:35:20 -04:00
NFS: Move NFS v3 acl functions to nfs3_fs.h
2014-09-12 13:50:26 -04:00
NFSv4: use exponential retry on NFS4ERR_DELAY for async requests.
2014-09-24 23:22:47 -04:00
kernel/watchdog.c: control hard lockup detection default
2014-10-14 02:18:27 +02:00
of: Introduce Device Tree resolve support.
2014-10-04 21:24:26 +01:00
of/pci: Fix the conversion of IO ranges into IO resources
2014-09-30 17:08:40 -06:00
of/pci: Add support for parsing PCI host bridge resources from DT
2014-09-30 17:08:57 -06:00
ARM: OMAP: Remove unused pieces of legacy DMA API
2014-09-18 09:53:25 -07:00
mm/balloon_compaction: remove balloon mapping and flag AS_BALLOON_MAP
2014-10-09 22:26:01 -04:00
PCI changes for the v3.18 merge window:
2014-10-09 15:03:49 -04:00
PCI: Remove unused pci_configure_slot()
2014-09-12 20:09:52 -06:00
Changes to existing drivers:
2014-10-15 06:58:16 +02:00
Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2014-10-10 07:26:02 -04:00
percpu: implement asynchronous chunk population
2014-09-02 14:46:05 -04:00
percpu_counter: add @gfp to percpu_counter_init()
2014-09-08 09:51:29 +09:00
net: phy: adjust fixed_phy_register() return value
2014-10-07 13:06:45 -04:00
Merge branch 'pm-domains'
2014-10-07 01:18:12 +02:00
PM / Domains: Rename cpu_data to cpuidle_data
2014-10-03 15:43:14 +02:00
power-supply: Forward declare structs together
2014-09-16 11:01:28 +02:00
lockd: move lockd's grace period handling into its own module
2014-09-17 16:33:11 -04:00
proportions: add @gfp to init functions
2014-09-08 09:51:30 +09:00
rbtree: add comment to rb_insert_augmented()
2014-10-14 02:18:21 +02:00
rcutorture: Rename rcutorture_runnable parameter
2014-09-16 13:41:44 -07:00
rcu: Per-CPU operation cleanups to rcu_*_qs() functions
2014-09-07 16:27:35 -07:00
kernel: add support for kernel restart handler call chain
2014-09-26 00:00:06 -07:00
lib/rhashtable: allow user to set the minimum shifts of shrinking
2014-09-03 20:56:32 -07:00
mm: convert a few VM_BUG_ON callers to VM_BUG_ON_VMA
2014-10-09 22:25:57 -04:00
net: sched: RCU cls_tcindex
2014-09-13 12:30:26 -04:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-13 16:23:15 +02:00
include/linux/screen_info.h: remove unused ORIG_* macros
2014-10-09 22:26:04 -04:00
seccomp: Allow arch code to provide seccomp_data
2014-09-03 14:58:17 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2014-10-12 10:13:55 -04:00
seqlock: Add irqsave variant of read_seqbegin_or_lock()
2014-09-19 12:35:16 +02:00
tty: serial: 8250: use 32bit variable for rpm_tx_active
2014-09-29 18:20:38 -07:00
tty: serial: 8250_core: allow to set ->throttle / ->unthrottle callbacks
2014-09-26 18:01:56 +02:00
signal: use BUILD_BUG() instead of _NSIG_WORDS_is_unsupported_size()
2014-10-14 02:18:20 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-10-08 21:40:54 -04:00
mm/sl[ao]b: always track caller in kmalloc_(node_)track_caller()
2014-10-09 22:25:50 -04:00
mm/slab: use percpu allocator for cpu cache
2014-10-09 22:25:51 -04:00
smp: Add new wake_up_all_idle_cpus() function
2014-09-19 12:35:15 +02:00
lib: string: Make all calls to strnicmp into calls to strncasecmp
2014-10-14 02:18:23 +02:00
lib / string_helpers: introduce string_escape_mem()
2014-10-14 02:18:26 +02:00
ACPI / sleep: Rework the handling of ACPI GPE wakeup from suspend-to-idle
2014-09-30 21:06:07 +02:00
mm: memcontrol: fix transparent huge page allocations under pressure
2014-10-09 22:25:59 -04:00
bpf: enable bpf syscall on x64 and i386
2014-09-26 15:05:14 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-10-08 21:40:54 -04:00
misc: st_kim: Increase size of dev_name buffer to incorporate termination
2014-09-26 08:15:29 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2014-10-14 03:47:00 +02:00
topology: add support for node_to_mem_node() to determine the fallback node
2014-10-09 22:25:51 -04:00
torture: Address race in module cleanup
2014-09-16 13:41:06 -07:00
tracing: generate RCU warnings even when tracepoints are disabled
2014-09-10 10:48:46 -04:00
tty: Fix width of unsigned long bitfield padding
2014-09-25 12:17:25 +02:00
tty: Serialize tty flow control changes with flow_lock
2014-09-23 21:19:35 -07:00
udp: Add support for doing checksum unnecessary conversion
2014-09-01 21:36:28 -07:00
Add copy_to_iter(), copy_from_iter() and iov_iter_zero()
2014-10-09 02:39:03 -04:00
usb: Add LED triggers for USB activity
2014-09-25 17:05:12 +02:00
uas: Add no-report-opcodes quirk
2014-09-23 21:40:48 -07:00
vgaswitcheroo: add vga_switcheroo_fini_domain_pm_ops
2014-09-18 19:21:20 -04:00
vgaarb: Drop obsolete #ifndef
2014-09-16 15:02:55 -06:00
mm/balloon_compaction: add vmstat counters and kpageflags bit
2014-10-09 22:26:01 -04:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-13 16:23:15 +02:00
workqueue: apply __WQ_ORDERED to create_singlethread_workqueue()
2014-09-13 05:13:08 +09:00
zsmalloc: change return value unit of zs_get_total_size_bytes
2014-10-09 22:26:02 -04:00
