aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
Commit message (Collapse)AuthorAge
* Merge LITMUS^RT staging (as of time of this commit).Christopher Kenna2012-09-29
|\ | | | | | | | | | | Conflicts: Makefile include/linux/sched.h
| * Merge 'Linux v3.0' into LitmusAndrea Bastoni2011-08-27
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some notes: * Litmus^RT scheduling class is the topmost scheduling class (above stop_sched_class). * scheduler_ipi() function (e.g., in smp_reschedule_interrupt()) may increase IPI latencies. * Added path into schedule() to quickly re-evaluate scheduling decision without becoming preemptive again. This used to be a standard path before the removal of BKL. Conflicts: Makefile arch/arm/kernel/calls.S arch/arm/kernel/smp.c arch/x86/include/asm/unistd_32.h arch/x86/kernel/smp.c arch/x86/kernel/syscall_table_32.S include/linux/hrtimer.h kernel/printk.c kernel/sched.c kernel/sched_fair.c
| * \ Merge commit 'v2.6.36' into wip-merge-2.6.36Andrea Bastoni2010-10-23
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile arch/x86/include/asm/unistd_32.h arch/x86/kernel/syscall_table_32.S kernel/sched.c kernel/time/tick-sched.c Relevant API and functions changes (solved in this commit): - (API) .enqueue_task() (enqueue_task_litmus), dequeue_task() (dequeue_task_litmus), [litmus/sched_litmus.c] - (API) .select_task_rq() (select_task_rq_litmus) [litmus/sched_litmus.c] - (API) sysrq_dump_trace_buffer() and sysrq_handle_kill_rt_tasks() [litmus/sched_trace.c] - struct kfifo internal buffer name changed (buffer -> buf) [litmus/sched_trace.c] - add_wait_queue_exclusive_locked -> __add_wait_queue_tail_exclusive [litmus/fmlp.c] - syscall numbers for both x86_32 and x86_64
| * \ \ Merge branch 'master' into wip-merge-2.6.34Andrea Bastoni2010-05-29
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple merge between master and 2.6.34 with conflicts resolved. This commit does not compile, the following main problems are still unresolved: - spinlock -> raw_spinlock API changes - kfifo API changes - sched_class API changes Conflicts: Makefile arch/x86/include/asm/hw_irq.h arch/x86/include/asm/unistd_32.h arch/x86/kernel/syscall_table_32.S include/linux/hrtimer.h kernel/sched.c kernel/sched_fair.c
| | * | | [ported from 2008.3] Core LITMUS^RT infrastructureAndrea Bastoni2010-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port 2008.3 Core LITMUS^RT infrastructure to Linux 2.6.32 litmus_sched_class implements 4 new methods: - prio_changed: void - switched_to: void - get_rr_interval: return infinity (i.e., 0) - select_task_rq: return current cpu
* | | | | Apply k4412 kernel from HardKernel for ODROID-X.Christopher Kenna2012-09-28
| | | | |
* | | | | Linux 3.0.42Greg Kroah-Hartman2012-08-26
| | | | |
* | | | | Linux 3.0.41Greg Kroah-Hartman2012-08-15
| | | | |
* | | | | Linux 3.0.40Greg Kroah-Hartman2012-08-09
| | | | |
* | | | | Linux 3.0.39Greg Kroah-Hartman2012-08-01
| | | | |
* | | | | Linux 3.0.38Greg Kroah-Hartman2012-07-19
| | | | |
* | | | | Linux 3.0.37Greg Kroah-Hartman2012-07-16
| | | | |
* | | | | Linux 3.0.36Greg Kroah-Hartman2012-06-22
| | | | |
* | | | | Linux 3.0.35Greg Kroah-Hartman2012-06-17
| | | | |
* | | | | Linux 3.0.34Greg Kroah-Hartman2012-06-09
| | | | |
* | | | | Linux 3.0.33Greg Kroah-Hartman2012-06-01
| | | | |
* | | | | Linux 3.0.32Greg Kroah-Hartman2012-05-21
| | | | |
* | | | | Linux 3.0.31Greg Kroah-Hartman2012-05-07
| | | | |
* | | | | Linux 3.0.30Greg Kroah-Hartman2012-04-27
| | | | |
* | | | | Linux 3.0.29Greg Kroah-Hartman2012-04-22
| | | | |
* | | | | Linux 3.0.28Greg Kroah-Hartman2012-04-13
| | | | |
* | | | | Linux 3.0.27Greg Kroah-Hartman2012-04-02
| | | | |
* | | | | Linux 3.0.26Greg Kroah-Hartman2012-03-23
| | | | |
* | | | | Linux 3.0.25Greg Kroah-Hartman2012-03-19
| | | | |
* | | | | Linux 3.0.24Greg Kroah-Hartman2012-03-12
| | | | |
* | | | | Linux 3.0.23Greg Kroah-Hartman2012-02-29
| | | | |
* | | | | Linux 3.0.22Greg Kroah-Hartman2012-02-20
| | | | |
* | | | | Linux 3.0.21Greg Kroah-Hartman2012-02-13
| | | | |
* | | | | Linux 3.0.20Greg Kroah-Hartman2012-02-06
| | | | |
* | | | | Linux 3.0.19Greg Kroah-Hartman2012-02-03
| | | | |
* | | | | Linux 3.0.18Greg Kroah-Hartman2012-01-25
| | | | |
* | | | | Linux 3.0.17Greg Kroah-Hartman2012-01-12
| | | | |
* | | | | Linux 3.0.16Greg Kroah-Hartman2012-01-06
| | | | |
* | | | | Linux 3.0.15Greg Kroah-Hartman2012-01-03
| | | | |
* | | | | Linux 3.0.14Greg Kroah-Hartman2011-12-21
| | | | |
* | | | | Linux 3.0.13Greg Kroah-Hartman2011-12-09
| | | | |
* | | | | Linux 3.0.12Greg Kroah-Hartman2011-11-28
| | | | |
* | | | | Linux 3.0.11Greg Kroah-Hartman2011-11-26
| | | | |
* | | | | Linux 3.0.10Greg Kroah-Hartman2011-11-21
| | | | |
* | | | | Linux 3.0.9Greg Kroah-Hartman2011-11-11
| | | | |
* | | | | Linux 3.0.8Greg Kroah-Hartman2011-10-25
| | | | |
* | | | | Linux 3.0.7Greg Kroah-Hartman2011-10-16
| | | | |
* | | | | Linux 3.0.6Greg Kroah-Hartman2011-10-03
| | | | |
* | | | | Linux 3.0.5Greg Kroah-Hartman2011-10-03
| | | | |
* | | | | Linux 3.0.4Greg Kroah-Hartman2011-08-29
| | | | |
* | | | | Linux 3.0.3Greg Kroah-Hartman2011-08-17
| | | | |
* | | | | Linux 3.0.2Greg Kroah-Hartman2011-08-15
| | | | |
* | | | | Linux 3.0.1Greg Kroah-Hartman2011-08-05
| |_|_|/ |/| | |
* | | | Linux 3.0Linus Torvalds2011-07-21
| | | |
* | | | Linux 3.0-rc7Linus Torvalds2011-07-11
| | | |