#
4cd1993f |
| 14-Aug-2009 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into timers/core
Reason: Martin's timekeeping cleanup series depends on both timers/core and mainline changes.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
#
384be2b1 |
| 14-Aug-2009 |
Tejun Heo <tj@kernel.org> |
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 m
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>
show more ...
|
Revision tags: v2.6.31-rc6 |
|
#
e290861f |
| 13-Aug-2009 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'sh/stable-updates'
|
#
aa11d958 |
| 13-Aug-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: arch/microblaze/include/asm/socket.h
|
#
89034bc2 |
| 11-Aug-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/core
Conflicts: kernel/trace/trace_events_filter.c
We use the tracing/core version.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
f222e8b4 |
| 10-Aug-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
#
a131bc18 |
| 08-Aug-2009 |
David Woodhouse <David.Woodhouse@intel.com> |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Pull fixes in from 2.6.31 so that people testing the iommu-2.6.git tree no longer trip over bugs which were already fixed (sorry
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Pull fixes in from 2.6.31 so that people testing the iommu-2.6.git tree no longer trip over bugs which were already fixed (sorry, Horms).
show more ...
|
#
012a5299 |
| 06-Aug-2009 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
#
13efdbec |
| 05-Aug-2009 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge branch 'pm-upstream/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-stable
|
#
e16852cf |
| 04-Aug-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'tracing/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/urgent
|
#
00111076 |
| 04-Aug-2009 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 into sh/hwblk
|
#
8e9ed8b0 |
| 02-Aug-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'sched/urgent' into sched/core
Merge reason: avoid upcoming patch conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
Revision tags: v2.6.31-rc5 |
|
#
0a52ac8d |
| 30-Jul-2009 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge branch 's3c-fixes-rc4' of git://aeryn.fluff.org.uk/bjdooks/linux
|
#
b4093d62 |
| 29-Jul-2009 |
Rafael J. Wysocki <rjw@sisk.pl> |
Merge branch 'master' into for-linus
|
Revision tags: v2.6.31-rc4 |
|
#
9e1b32ca |
| 22-Jul-2009 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()
mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()
Upcoming paches to support the new 64-bit "BookE" powerpc architecture will need to hav
mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()
mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()
Upcoming paches to support the new 64-bit "BookE" powerpc architecture will need to have the virtual address corresponding to PTE page when freeing it, due to the way the HW table walker works.
Basically, the TLB can be loaded with "large" pages that cover the whole virtual space (well, sort-of, half of it actually) represented by a PTE page, and which contain an "indirect" bit indicating that this TLB entry RPN points to an array of PTEs from which the TLB can then create direct entries. Thus, in order to invalidate those when PTE pages are deleted, we need the virtual address to pass to tlbilx or tlbivax instructions.
The old trick of sticking it somewhere in the PTE page struct page sucks too much, the address is almost readily available in all call sites and almost everybody implemets these as macros, so we may as well add the argument everywhere. I added it to the pmd and pud variants for consistency.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: David Howells <dhowells@redhat.com> [MN10300 & FRV] Acked-by: Nick Piggin <npiggin@suse.de> Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com> [s390] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
Revision tags: v2.6.31-rc3, v2.6.31-rc2, v2.6.31-rc1, v2.6.30, v2.6.30-rc8, v2.6.30-rc7, v2.6.30-rc6, v2.6.30-rc5, v2.6.30-rc4, v2.6.30-rc3, v2.6.30-rc2, v2.6.30-rc1, v2.6.29, v2.6.29-rc8, v2.6.29-rc7, v2.6.29-rc6, v2.6.29-rc5, v2.6.29-rc4, v2.6.29-rc3, v2.6.29-rc2, v2.6.29-rc1, v2.6.28, v2.6.28-rc9, v2.6.28-rc8, v2.6.28-rc7, v2.6.28-rc6, v2.6.28-rc5, v2.6.28-rc4, v2.6.28-rc3 |
|
#
7a9787e1 |
| 28-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks
|
Revision tags: v2.6.28-rc2, v2.6.28-rc1 |
|
#
b2aaf8f7 |
| 15-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into stackprotector
Conflicts: arch/x86/kernel/Makefile include/asm-x86/pda.h
|
#
accba5f3 |
| 13-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into oprofile-v2
Conflicts: arch/x86/kernel/apic_32.c arch/x86/oprofile/nmi_int.c include/linux/pci_ids.h
|
Revision tags: v2.6.27, v2.6.27-rc9 |
|
#
f68ec0c2 |
| 03-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc8' into x86/setup
|
#
d6d5aeb6 |
| 02-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc8' into genirq
|
Revision tags: v2.6.27-rc8 |
|
#
ebdd90a8 |
| 24-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc7' into x86/pebs
|
#
0b88641f |
| 22-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc7' into x86/debug
|
Revision tags: v2.6.27-rc7, v2.6.27-rc6, v2.6.27-rc5 |
|
#
470fba7e |
| 21-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/doc
|
Revision tags: v2.6.27-rc4 |
|
#
2879a927 |
| 19-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/oprofile' into oprofile
|
#
f3efbe58 |
| 15-Aug-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/gart
|