Revision tags: v2.6.15-rc1 |
|
#
ca869912 |
| 11-Nov-2005 |
Dave Kleikamp <shaggy@austin.ibm.com> |
Merge with /home/shaggy/git/linus-clean/
|
#
9b80b11c |
| 11-Nov-2005 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
|
#
45fb6cea |
| 10-Nov-2005 |
Anton Blanchard <anton@samba.org> |
[PATCH] ppc64: Convert NUMA to sparsemem (3)
Convert to sparsemem and remove all the discontigmem code in the process. This has a few advantages:
- The old numa_memory_lookup_table can go away - Al
[PATCH] ppc64: Convert NUMA to sparsemem (3)
Convert to sparsemem and remove all the discontigmem code in the process. This has a few advantages:
- The old numa_memory_lookup_table can go away - All the arch specific discontigmem magic can go away
We also remove the triple pass of memory properties and instead create a list of per node extents that we iterate through. A final cleanup would be to change our lmb code to store extents per node, then we can reuse that information in the numa code.
Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
show more ...
|
#
3e66c4de |
| 10-Nov-2005 |
Anton Blanchard <anton@samba.org> |
[PATCH] ppc64: prep for NUMA sparsemem rework 2
Remove ppc64 specific version of nr_cpus_node and use the generic one provided.
Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Paul
[PATCH] ppc64: prep for NUMA sparsemem rework 2
Remove ppc64 specific version of nr_cpus_node and use the generic one provided.
Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
show more ...
|
#
e532c378 |
| 11-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
#
3b621ee5 |
| 11-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
#
2f67bdb2 |
| 10-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
#
e82b3aec |
| 09-Nov-2005 |
Steve French <sfrench@us.ibm.com> |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
#
8006fdd6 |
| 09-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'upstream'
|
#
c7c6e949 |
| 09-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'upstream'
|
#
a892acac |
| 09-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
#
f093182d |
| 07-Nov-2005 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
|
#
2249ca9d |
| 06-Nov-2005 |
Paul Mackerras <paulus@samba.org> |
powerpc: Various UP build fixes
Mostly this involves adding #include <asm/smp.h>, since that defines things like boot_cpuid[_phys] and [gs]et_hard_smp_processor_id, which are SMP-related but still n
powerpc: Various UP build fixes
Mostly this involves adding #include <asm/smp.h>, since that defines things like boot_cpuid[_phys] and [gs]et_hard_smp_processor_id, which are SMP-related but still needed on UP. This incorporates fixes posted by Olof Johansson and Heikki Lindholm.
Signed-off-by: Paul Mackerras <paulus@samba.org>
show more ...
|
#
2fc29911 |
| 06-Nov-2005 |
Thomas Gleixner <tglx@mtd.linutronix.de> |
Merge branch 'master' of /home/tglx/work/mtd/git/linux-2.6.git/
|
#
18ce920a |
| 05-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
#
8cedcfd4 |
| 05-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
#
7211bb9b |
| 05-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
#
87199134 |
| 05-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
#
328198ac |
| 05-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
#
c2cc87ca |
| 04-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
#
c7fb577e |
| 31-Oct-2005 |
Tony Luck <tony.luck@intel.com> |
manual update from upstream:
Applied Al's change 06a544971fad0992fe8b92c5647538d573089dd4 to new location of swiotlb.c
Signed-off-by: Tony Luck <tony.luck@intel.com>
|
#
53b2ec55 |
| 31-Oct-2005 |
Steve French <sfrench@us.ibm.com> |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
#
1f04c0a2 |
| 31-Oct-2005 |
Anton Altaparmakov <aia21@cantab.net> |
Merge branch 'master' of /usr/src/ntfs-2.6/
|
#
cf00a8d1 |
| 30-Oct-2005 |
Paul Mackerras <paulus@samba.org> |
powerpc: Fix bug arising from having multiple memory_limit variables
We had a static memory_limit in prom.c, and then another one defined in setup_64.c and used in numa.c, which resulted in the kern
powerpc: Fix bug arising from having multiple memory_limit variables
We had a static memory_limit in prom.c, and then another one defined in setup_64.c and used in numa.c, which resulted in the kernel crashing when mem=xxx was given on the command line. This puts the declaration in system.h and the definition in mem.c. This also moves the definition of tce_alloc_start/end out of setup_64.c.
Signed-off-by: Paul Mackerras <paulus@samba.org>
show more ...
|
Revision tags: v2.6.14, v2.6.14-rc5, v2.6.14-rc4 |
|
#
ab1f9dac |
| 10-Oct-2005 |
Paul Mackerras <paulus@samba.org> |
powerpc: Merge arch/ppc64/mm to arch/powerpc/mm
This moves the remaining files in arch/ppc64/mm to arch/powerpc/mm, and arranges that we use them when compiling with ARCH=ppc64.
Signed-off-by: Paul
powerpc: Merge arch/ppc64/mm to arch/powerpc/mm
This moves the remaining files in arch/ppc64/mm to arch/powerpc/mm, and arranges that we use them when compiling with ARCH=ppc64.
Signed-off-by: Paul Mackerras <paulus@samba.org>
show more ...
|