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
bpf: add search pruning optimization to verifier
2014-10-01 21:30:33 -04:00
x86: Add "make tinyconfig" to configure the tiniest possible kernel
2014-08-08 16:30:24 -07:00
kdb: replace strnicmp with strncasecmp
2014-10-14 02:18:25 +02:00
Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2014-10-15 07:48:18 +02:00
ARM: 8153/1: Enable gcov support on the ARM architecture
2014-09-26 14:39:57 +01:00
Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2014-10-15 07:48:18 +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
Merge branch 'pm-domains'
2014-10-07 01:18:12 +02:00
Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2014-10-15 07:48:18 +02:00
rcu: Eliminate deadlock between CPU hotplug and expedited grace periods
2014-09-18 16:22:27 -07:00
Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2014-10-15 07:48:18 +02:00
Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2014-10-15 07:48:18 +02: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
acct: eliminate compile warning
2014-10-09 22:26:04 -04:00
kernel/async.c: switch to pr_foo()
2014-10-09 22:26:04 -04:00
CAPABILITIES: remove undefined caps from all processes
2014-07-24 21:53:47 +10:00
audit: Use struct net not pid_t to remember the network namespce to reply in
2014-03-20 10:10:53 -04:00
kernel/auditfilter.c: replace count*size kmalloc by kcalloc
2014-08-06 18:01:12 -07:00
Documentation: Docbook: Fix generated DocBook/kernel-api.xml
2014-09-09 10:34:56 +02:00
kernel/backtracetest.c: replace no level printk by pr_info()
2014-06-04 16:54:14 -07:00
page-cgroup: get rid of NR_PCG_FLAGS
2014-08-08 15:57:18 -07:00
CAPABILITIES: remove undefined caps from all processes
2014-07-24 21:53:47 +10: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
cgroup: rename cgroup_subsys->base_cftypes to ->legacy_cftypes
2014-07-15 11:05:09 -04:00
compat: nanosleep: Clarify error handling
2014-09-06 12:58:18 +02:00
x86/kprobes: Fix build errors and blacklist context_track_user
2014-06-14 09:07:44 +02:00
rcu: Eliminate deadlock between CPU hotplug and expedited grace periods
2014-09-18 16:22:27 -07: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
crash_dump: Make is_kdump_kernel() accessible from modules
2014-08-25 15:42:19 -07:00
delayacct: Remove braindamaged type conversions
2014-07-23 10:18:06 -07:00
kernel/exec_domain.c: code clean-up
2014-06-04 16:54:15 -07: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
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
futex: Unlock hb->lock in futex_wait_requeue_pi() error path
2014-09-12 22:04:36 +02:00
kernel/groups.c: remove return value of set_groups
2014-04-03 16:21:05 -07:00
kernel/hung_task.c: convert simple_strtoul to kstrtouint
2014-06-04 16:54:15 -07:00
Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2014-10-15 07:48:18 +02:00
kernel/kallsyms.c: use __seq_open_private()
2014-10-14 02:18:16 +02:00
kcmp: fix standard comparison bug
2014-09-10 15:42:12 -07:00
locking/rwsem: Add CONFIG_RWSEM_SPIN_ON_OWNER
2014-07-16 14:57:13 +02:00
kexec: remove the unused function parameter
2014-10-14 02:18:21 +02:00
signals: change wait_for_helper() to use kernel_sigaction()
2014-06-06 16:08:12 -07:00
kprobes: Skip kretprobe hit in NMI context to avoid deadlock
2014-08-08 10:38:04 +02:00
kobject: Make support for uevent_helper optional.
2014-04-25 12:00:49 -07:00
kernel/kthread.c: partial revert of 81c98869fa ("kthread: ensure locality of task_struct allocations")
2014-10-09 22:25:51 -04:00
kernel/latencytop.c: convert seq_printf to seq_puts
2014-06-04 16:54:15 -07:00
bin2c: move bin2c in scripts/basic
2014-08-08 15:57:32 -07:00
arm64 updates for 3.18:
2014-10-08 05:34:24 -04:00
kprobes, notifier: Use NOKPROBE_SYMBOL macro in notifier
2014-04-24 10:26:39 +02:00
namespaces: Use task_lock and not rcu to protect nsproxy
2014-07-29 18:08:50 -07:00
panic: add TAINT_SOFTLOCKUP
2014-08-08 15:57:24 -07:00
kernel/param: consolidate __{start,stop}___param[] in <linux/moduleparam.h>
2014-10-14 02:18:28 +02:00
pid_namespace: pidns_get() should check task_active_pid_ns() != NULL
2014-04-02 16:20:21 -07:00
kernel/profile.c: use static const char instead of static char
2014-06-06 16:08:13 -07:00
sched: Remove proliferation of wait_on_bit() action functions
2014-07-16 15:10:39 +02:00
kernel: add support for kernel restart handler call chain
2014-09-26 00:00:06 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
kernel/res_counter.c: replace simple_strtoull by kstrtoull
2014-06-04 16:54:15 -07:00
x86: optimize resource lookups for ioremap
2014-10-14 02:18:22 +02:00
Merge branch 'x86-seccomp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-14 02:27:06 +02:00
Merge branch 'signal-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc
2014-08-09 09:58:12 -07:00
Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2014-10-15 07:48:18 +02:00
Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2014-10-15 07:48:18 +02:00
kernel/stop_machine.c: kernel-doc warning fix
2014-06-04 16:54:15 -07: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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-10-08 21:40:54 -04:00
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-13 15:44:12 +02:00
dmaengine-3.17
2014-10-07 20:39:25 -04:00
KEYS: validate certificate trust only with builtin keys
2014-07-17 09:35:17 -04:00
scheduler: Replace __get_cpu_var with this_cpu_ptr
2014-08-26 13:45:45 -04:00
kernel/test_kprobes.c: use current logging functions
2014-08-08 15:57:18 -07:00
torture: Address race in module cleanup
2014-09-16 13:41:06 -07:00
tracing: syscall_regfunc() should not skip kernel threads
2014-06-21 00:15:26 -04:00
sched: Make task->start_time nanoseconds based
2014-07-23 10:18:05 -07:00
smp: Rename __smp_call_function_single() to smp_call_function_single_async()
2014-02-24 14:47:15 -08:00
scheduler: Replace __get_cpu_var with this_cpu_ptr
2014-08-26 13:45:45 -04:00
kernel/user.c: drop unused field 'files' from user_struct
2014-06-04 16:54:16 -07:00
proc: constify seq_operations
2014-08-08 15:57:22 -07:00
namespaces: Use task_lock and not rcu to protect nsproxy
2014-07-29 18:08:50 -07:00
sysctl: convert use of typedef ctl_table to struct ctl_table
2014-06-06 16:08:16 -07:00
Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2014-10-15 07:48:18 +02:00
workqueue: Use cond_resched_rcu_qs macro
2014-10-06 05:58:26 -07:00
workqueue: rename manager_mutex to attach_mutex
2014-05-20 10:59:32 -04:00
0429fbc0bd