leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
384be2b18a
linux/arch/um/kernel
History
Tejun Heo 384be2b18a Merge branch 'percpu-for-linus' into percpu-for-next 
Conflicts:
	arch/sparc/kernel/smp_64.c
	arch/x86/kernel/cpu/perf_counter.c
	arch/x86/kernel/setup_percpu.c
	drivers/cpufreq/cpufreq_ondemand.c
	mm/percpu.c

Conflicts in core and arch percpu codes are mostly from commit
ed78e1e078dd44249f88b1dd8c76dafb39567161 which substituted many
num_possible_cpus() with nr_cpu_ids.  As for-next branch has moved all
the first chunk allocators into mm/percpu.c, the changes are moved
from arch code to mm/percpu.c.

Signed-off-by: Tejun Heo <tj@kernel.org>
2009-08-14 14:45:31 +09:00
..
skas uml: fix mm_context memory leak 2008-02-08 09:22:43 -08:00
asm-offsets.c [PATCH] uml: fix missing KBUILD_BASENAME 2006-01-11 18:42:09 -08:00
config.c.in uml: remove useless comments 2009-04-01 08:59:17 -07:00
dyn.lds.S linker script: unify usage of discard definition 2009-07-09 11:27:40 +09:00
exec.c x86, um: get rid of uml unistd.h 2008-10-22 22:55:21 -07:00
exitcode.c proc: remove proc_root from drivers 2008-04-29 08:06:18 -07:00
gmon_syms.c uml: style fixes in arch/um/kernel 2008-02-05 09:44:30 -08:00
gprof_syms.c uml: style fixes in arch/um/kernel 2008-02-05 09:44:30 -08:00
init_task.c mm: consolidate init_mm definition 2009-06-16 19:47:28 -07:00
initrd.c uml: fix initrd printk 2008-02-23 17:12:13 -08:00
internal.h x86, um: get rid of uml unistd.h 2008-10-22 22:55:21 -07:00
irq.c um: remove obsolete hw_interrupt_type 2009-06-16 19:47:47 -07:00
ksyms.c arch/um/kernel/mem.c: remove arch_validate() 2008-07-24 10:47:24 -07:00
Makefile uml: don't use a too long string literal 2009-04-01 08:59:16 -07:00
mem.c um: use generic show_mem() 2008-07-26 12:00:10 -07:00
physmem.c UML: make several more things static 2008-07-24 10:47:24 -07:00
process.c Simplify copy_thread() 2009-04-02 19:04:51 -07:00
ptrace.c UML on UML fixed: it did not start 2009-03-12 16:20:23 -07:00
reboot.c uml: style fixes in arch/um/kernel 2008-02-05 09:44:30 -08:00
sigio.c uml: style fixes in arch/um/kernel 2008-02-05 09:44:30 -08:00
signal.c x86, um: sanitize uml sigcontext.h uses 2008-10-22 22:55:20 -07:00
smp.c cpumask: centralize cpu_online_map and cpu_possible_map 2008-12-13 21:19:41 +10:30
syscall.c uml: fix warnings in kernel_execve 2009-04-02 19:04:50 -07:00
sysrq.c Remove multiple KERN_ prefixes from printk formats 2009-07-08 10:30:03 -07:00
time.c clocksource: pass clocksource to read() callback 2009-04-21 13:41:47 -07:00
tlb.c uml: style fixes in arch/um/kernel 2008-02-05 09:44:30 -08:00
trap.c Move FAULT_FLAG_xyz into handle_mm_fault() callers 2009-06-21 13:08:22 -07:00
uaccess.c UML: make several more things static 2008-07-24 10:47:24 -07:00
um_arch.c uml: deal with inaccessible address space start 2008-06-06 11:29:10 -07:00
umid.c uml: style fixes in arch/um/kernel 2008-02-05 09:44:30 -08:00
uml.lds.S linker script: unify usage of discard definition 2009-07-09 11:27:40 +09:00
vmlinux.lds.S [PATCH] uml: tidy biarch gcc support 2006-07-14 21:53:52 -07:00