Linus Torvalds ada3fa1505 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

2009-09-15 09:39:44 -07:00

..

bitops

asm-generic: rename atomic.h to atomic-long.h

2009-06-11 21:02:17 +02:00

4level-fixup.h

mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()

2009-07-27 12:10:38 -07:00

atomic64.h

lib: Provide generic atomic64_t implementation

2009-06-15 13:27:38 +10:00

atomic-long.h

asm-generic: merge branch 'master' of torvalds/linux-2.6

2009-06-12 11:32:58 +02:00

atomic.h

asm-generic: add generic atomic.h and io.h

2009-06-11 21:02:49 +02:00

audit_change_attr.h

[PATCH] fix missing ifdefs in syscall classes hookup for generic targets

2006-09-22 17:48:56 -07:00

audit_dir_write.h

[PATCH] fix missing ifdefs in syscall classes hookup for generic targets

2006-09-22 17:48:56 -07:00

audit_read.h

[PATCH] audit: more syscall classes added

2006-09-11 13:32:27 -04:00

audit_signal.h

[PATCH] add SIGNAL syscall class (v3)

2007-05-11 05:38:25 -04:00

audit_write.h

[PATCH] asm/generic: fix bug - kernel fails to build when enable some common audit code on Blackfin

2008-12-09 02:27:39 -05:00

auxvec.h

asm-generic: add generic ABI headers

2009-06-11 21:02:15 +02:00

bitops.h

asm-generic: make bitops.h usable

2009-06-11 21:02:31 +02:00

bitsperlong.h

asm-generic: introduce asm/bitsperlong.h

2009-06-11 21:02:14 +02:00

bug.h

Eliminate thousands of warnings with gcc 3.2 build

2009-05-06 16:36:09 -07:00

bugs.h

asm-generic: add generic versions of common headers

2009-06-11 21:02:37 +02:00

cache.h

asm-generic: add generic NOMMU versions of some headers

2009-06-11 21:02:50 +02:00

cacheflush.h

asm-generic: add generic NOMMU versions of some headers

2009-06-11 21:02:50 +02:00

checksum.h

add generic lib/checksum.c

2009-06-11 21:02:51 +02:00

cmpxchg-local.h

Add cmpxchg_local to asm-generic for per cpu atomic operations

2008-02-07 08:42:30 -08:00

cmpxchg.h

Add cmpxchg_local to asm-generic for per cpu atomic operations

2008-02-07 08:42:30 -08:00

cputime.h

taskstats scaled time cleanup

2008-02-06 10:41:00 -08:00

current.h

asm-generic: add generic versions of common headers

2009-06-11 21:02:37 +02:00

delay.h

asm-generic: add generic versions of common headers

2009-06-11 21:02:37 +02:00

device.h

Driver Core: Add platform device arch data V3

2009-07-22 00:28:38 +02:00

div64.h

rename div64_64 to div64_u64

2008-05-01 08:03:58 -07:00

dma-coherent.h

generic: per-device coherent dma allocator

2008-06-30 12:51:05 +02:00

dma-mapping-broken.h

dma-mapping: add the device argument to dma_mapping_error()

2008-07-26 12:00:03 -07:00

dma-mapping-common.h

dma-ops: Remove flush_write_buffers() in dma-mapping-common.h

2009-08-10 09:34:57 +02:00

dma.h

asm-generic: add legacy I/O header files

2009-06-11 21:02:42 +02:00

emergency-restart.h

[PATCH] Add emergency_restart()

2005-07-26 14:35:41 -07:00

errno-base.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

errno.h

cfg80211: add rfkill support

2009-06-03 14:06:14 -04:00

fb.h

asm-generic: add generic versions of common headers

2009-06-11 21:02:37 +02:00

fcntl.h

make exported headers use strict posix types

2009-03-26 18:14:14 +01:00

futex.h

remove __KERNEL__ tests of unexported headers under asm-generic/

2008-04-30 08:29:54 -07:00

getorder.h

asm-generic: rename page.h and uaccess.h

2009-06-11 21:02:17 +02:00

gpio.h

gpiolib: allow GPIOs to be named

2009-04-02 19:04:51 -07:00

hardirq.h

asm-generic: drop HARDIRQ_BITS definition from hardirq.h

2009-06-19 14:58:09 +02:00

hw_irq.h

asm-generic: add legacy I/O header files

2009-06-11 21:02:42 +02:00

ide_iops.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

int-l64.h

asm-generic: introduce asm/bitsperlong.h

2009-06-11 21:02:14 +02:00

int-ll64.h

asm-generic: introduce asm/bitsperlong.h

2009-06-11 21:02:14 +02:00

io.h

asm-generic: add generic atomic.h and io.h

2009-06-11 21:02:49 +02:00

ioctl.h

Make ioctl.h compatible with userland

2008-08-12 16:07:31 -07:00

ioctls.h

asm-generic: add generic ABI headers

2009-06-11 21:02:15 +02:00

iomap.h

generic: add ioremap_wc() interface wrapper

2008-04-24 23:40:47 +02:00

ipcbuf.h

asm-generic: add generic sysv ipc headers

2009-06-11 21:02:15 +02:00

irq_regs.h

IRQ: Maintain regs pointer globally rather than passing to IRQ handlers

2006-10-05 15:10:12 +01:00

irq.h

asm-generic: add generic versions of common headers

2009-06-11 21:02:37 +02:00

irqflags.h

asm-generic: add generic versions of common headers

2009-06-11 21:02:37 +02:00

Kbuild

asm-generic: add a generic unistd.h

2009-06-11 21:02:16 +02:00

Kbuild.asm

KVM: export kvm_para.h

2009-09-10 10:46:47 +03:00

kdebug.h

asm-generic: define DIE_OOPS in asm-generic

2008-10-27 11:39:03 +01:00

kmap_types.h

Merge branch 'linus' into perfcounters/core

2009-06-17 13:06:17 +02:00

libata-portmap.h

libata-portmap: Remove unused definitions

2007-10-12 14:55:37 -04:00

linkage.h

asm-generic: add generic versions of common headers

2009-06-11 21:02:37 +02:00

local.h

asm-generic: fix local_add_unless macro

2009-05-18 08:34:08 -07:00

memory_model.h

mm: remove CONFIG_OUT_OF_LINE_PFN_TO_PAGE

2009-01-06 15:59:10 -08:00

mm_hooks.h

[PATCH] x86: PARAVIRT: add hooks to intercept mm creation and destruction

2007-05-02 19:27:14 +02:00

mman-common.h

asm-generic: rename termios.h, signal.h and mman.h

2009-06-11 21:01:52 +02:00

mman.h

asm-generic: add generic ABI headers

2009-06-11 21:02:15 +02:00

mmu_context.h

asm-generic: add generic NOMMU versions of some headers

2009-06-11 21:02:50 +02:00

mmu.h

asm-generic: add generic NOMMU versions of some headers

2009-06-11 21:02:50 +02:00

module.h

asm-generic: add generic versions of common headers

2009-06-11 21:02:37 +02:00

msgbuf.h

asm-generic: add generic sysv ipc headers

2009-06-11 21:02:15 +02:00

mutex-dec.h

mutex: speed up generic mutex implementations

2008-10-23 09:18:20 -07:00

mutex-null.h

fix file specification in comments

2006-10-03 23:01:26 +02:00

mutex-xchg.h

mutex: speed up generic mutex implementations

2008-10-23 09:18:20 -07:00

mutex.h

asm-generic: add generic versions of common headers

2009-06-11 21:02:37 +02:00

page.h

asm-generic: add generic NOMMU versions of some headers

2009-06-11 21:02:50 +02:00

param.h

asm-generic: add generic ABI headers

2009-06-11 21:02:15 +02:00

parport.h

asm-generic: add legacy I/O header files

2009-06-11 21:02:42 +02:00

pci-dma-compat.h

dma-mapping: add the device argument to dma_mapping_error()

2008-07-26 12:00:03 -07:00

pci.h

Delete pcibios_select_root

2009-06-17 14:04:42 -07:00

percpu.h

x86/i386: Put aligned stack-canary in percpu shared_aligned section

2009-09-04 07:10:31 +02:00

pgalloc.h

asm-generic: add generic NOMMU versions of some headers

2009-06-11 21:02:50 +02:00

pgtable-nopmd.h

mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()

2009-07-27 12:10:38 -07:00

pgtable-nopud.h

mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()

2009-07-27 12:10:38 -07:00

pgtable.h

asm-generic: add dummy pgprot_noncached()

2009-06-23 14:34:30 +02:00

poll.h

Consolidate asm/poll.h

2007-05-11 08:29:34 -07:00

posix_types.h

asm-generic: add generic ABI headers

2009-06-11 21:02:15 +02:00

resource.h

sched: SCHED_FIFO/SCHED_RR watchdog timer

2008-01-25 21:08:27 +01:00

rtc.h

asm-generic: make get_rtc_time overridable

2009-06-11 21:02:18 +02:00

scatterlist.h

asm-generic: add generic versions of common headers

2009-06-11 21:02:37 +02:00

sections.h

kernel: constructor support

2009-06-18 13:03:57 -07:00

segment.h

asm-generic: add generic NOMMU versions of some headers

2009-06-11 21:02:50 +02:00

sembuf.h

asm-generic: add generic sysv ipc headers

2009-06-11 21:02:15 +02:00

serial.h

asm-generic: add legacy I/O header files

2009-06-11 21:02:42 +02:00

setup.h

asm-generic: add generic ABI headers

2009-06-11 21:02:15 +02:00

shmbuf.h

asm-generic: add generic sysv ipc headers

2009-06-11 21:02:15 +02:00

shmparam.h

asm-generic: add generic sysv ipc headers

2009-06-11 21:02:15 +02:00

siginfo.h

asm-generic/siginfo.h: update NSIGTRAP definition

2009-04-13 15:04:30 -07:00

signal-defs.h

asm-generic: rename termios.h, signal.h and mman.h

2009-06-11 21:01:52 +02:00

signal.h

asm-generic: add generic ABI headers

2009-06-11 21:02:15 +02:00

socket.h

net: implement a SO_DOMAIN getsockoption

2009-08-05 13:02:57 -07:00

sockios.h

asm-generic: add generic ABI headers

2009-06-11 21:02:15 +02:00

spinlock.h

asm-generic: add generic versions of common headers

2009-06-11 21:02:37 +02:00

stat.h

asm-generic: add generic ABI headers

2009-06-11 21:02:15 +02:00

statfs.h

remove __KERNEL_STRICT_NAMES

2009-03-26 18:14:21 +01:00

string.h

asm-generic: add generic versions of common headers

2009-06-11 21:02:37 +02:00

swab.h

asm-generic: add generic ABI headers

2009-06-11 21:02:15 +02:00

syscall.h

tracehook: comment pasto fixes

2008-09-05 14:39:38 -07:00

syscalls.h

asm-generic: add generic versions of common headers

2009-06-11 21:02:37 +02:00

system.h

asm-generic: add generic versions of common headers

2009-06-11 21:02:37 +02:00

termbits.h

asm-generic: add generic ABI headers

2009-06-11 21:02:15 +02:00

termios-base.h

asm-generic: rename termios.h, signal.h and mman.h

2009-06-11 21:01:52 +02:00

termios.h

asm-generic: add generic ABI headers

2009-06-11 21:02:15 +02:00

timex.h

asm-generic: add legacy I/O header files

2009-06-11 21:02:42 +02:00

tlb.h

mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()

2009-07-27 12:10:38 -07:00

tlbflush.h

asm-generic: add generic NOMMU versions of some headers

2009-06-11 21:02:50 +02:00

topology.h

cpumask: remove the now-obsoleted pcibus_to_cpumask(): generic

2009-03-30 22:05:17 +10:30

types.h

asm-generic: add generic ABI headers

2009-06-11 21:02:15 +02:00

uaccess-unaligned.h

asm-generic: rename page.h and uaccess.h

2009-06-11 21:02:17 +02:00

uaccess.h

asm-generic: uaccess: fix up local access_ok() usage

2009-06-19 14:58:08 +02:00

ucontext.h

asm-generic: add generic ABI headers

2009-06-11 21:02:15 +02:00

unaligned.h

asm-generic: add generic versions of common headers

2009-06-11 21:02:37 +02:00

unistd.h

asm-generic: hook up new system calls

2009-06-19 14:58:11 +02:00

user.h

asm-generic: add generic versions of common headers

2009-06-11 21:02:37 +02:00

vga.h

asm-generic: add legacy I/O header files

2009-06-11 21:02:42 +02:00

vmlinux.lds.h

Merge branch 'percpu-for-linus' into percpu-for-next

2009-08-14 14:45:31 +09:00

xor.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00