diff options
| author | Linus Torvalds | 2009-09-15 18:39:44 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-09-15 18:39:44 +0200 |
| commit | ada3fa15057205b7d3f727bba5cd26b5912e350f (patch) | |
| tree | 60962fc9e4021b92f484d1a58e72cd3906d4f3db /scripts/gcc-x86_64-has-stack-protector.sh | |
| parent | Nicolas Pitre has a new email address (diff) | |
| parent | Merge branch 'for-next' into for-linus (diff) | |
| download | kernel-qcow2-linux-ada3fa15057205b7d3f727bba5cd26b5912e350f.tar.gz kernel-qcow2-linux-ada3fa15057205b7d3f727bba5cd26b5912e350f.tar.xz kernel-qcow2-linux-ada3fa15057205b7d3f727bba5cd26b5912e350f.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (46 commits)
powerpc64: convert to dynamic percpu allocator
sparc64: use embedding percpu first chunk allocator
percpu: kill lpage first chunk allocator
x86,percpu: use embedding for 64bit NUMA and page for 32bit NUMA
percpu: update embedding first chunk allocator to handle sparse units
percpu: use group information to allocate vmap areas sparsely
vmalloc: implement pcpu_get_vm_areas()
vmalloc: separate out insert_vmalloc_vm()
percpu: add chunk->base_addr
percpu: add pcpu_unit_offsets[]
percpu: introduce pcpu_alloc_info and pcpu_group_info
percpu: move pcpu_lpage_build_unit_map() and pcpul_lpage_dump_cfg() upward
percpu: add @align to pcpu_fc_alloc_fn_t
percpu: make @dyn_size mandatory for pcpu_setup_first_chunk()
percpu: drop @static_size from first chunk allocators
percpu: generalize first chunk allocator selection
percpu: build first chunk allocators selectively
percpu: rename 4k first chunk allocator to page
percpu: improve boot messages
percpu: fix pcpu_reclaim() locking
...
Fix trivial conflict as by Tejun Heo in kernel/sched.c
Diffstat (limited to 'scripts/gcc-x86_64-has-stack-protector.sh')
0 files changed, 0 insertions, 0 deletions