linux.git/mm, branch v2.6.26-rc2

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

2008-05-08T17:48:36+00:00

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  Revert "relay: fix splice problem"
  docbook: fix bio missing parameter
  block: use unitialized_var() in bio_alloc_bioset()
  block: avoid duplicate calls to get_part() in disk stat code
  cfq-iosched: make io priorities inherit CPU scheduling class as well as nice
  block: optimize generic_unplug_device()
  block: get rid of likely/unlikely predictions in merge logic
  vfs: splice remove_suid() cleanup
  cfq-iosched: fix RCU race in the cfq io_context destructor handling
  block: adjust tagging function queue bit locking
  block: sysfs store function needs to grab queue_lock and use queue_flag_*()

slub: fix atomic usage in any_slab_objects()

2008-05-08T17:46:56+00:00

any_slab_objects() does an atomic_read on an atomic_long_t, this
fixes it to use atomic_long_read instead.

Signed-off-by: Benjamin Herrenschmidt 
Cc: Christoph Lameter 
Cc: Pekka Enberg 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

vfs: splice remove_suid() cleanup

2008-05-07T07:29:00+00:00

generic_file_splice_write() duplicates remove_suid() just because it
doesn't hold i_mutex.  But it grabs i_mutex inside splice_from_pipe()
anyway, so this is rather pointless.

Move locking to generic_file_splice_write() and call remove_suid() and
__splice_from_pipe() instead.

Signed-off-by: Miklos Szeredi 
Signed-off-by: Jens Axboe

x86: fix PAE pmd_bad bootup warning

2008-05-06T20:08:58+00:00

Fix warning from pmd_bad() at bootup on a HIGHMEM64G HIGHPTE x86_32.

That came from 9fc34113f6880b215cbea4e7017fc818700384c2 x86: debug pmd_bad();
but we understand now that the typecasting was wrong for PAE in the previous
version: pagetable pages above 4GB looked bad and stopped Arjan from booting.

And revert that cded932b75ab0a5f9181ee3da34a0a488d1a14fd x86: fix pmd_bad
and pud_bad to support huge pages.  It was the wrong way round: we shouldn't
weaken every pmd_bad and pud_bad check to let huge pages slip through - in
part they check that we _don't_ have a huge page where it's not expected.

Put the x86 pmd_bad() and pud_bad() definitions back to what they have long
been: they can be improved (x86_32 should use PTE_MASK, to stop PAE thinking
junk in the upper word is good; and x86_64 should follow x86_32's stricter
comparison, to stop thinking any subset of required bits is good); but that
should be a later patch.

Fix Hans' good observation that follow_page() will never find pmd_huge()
because that would have already failed the pmd_bad test: test pmd_huge in
between the pmd_none and pmd_bad tests.  Tighten x86's pmd_huge() check?
No, once it's a hugepage entry, it can get quite far from a good pmd: for
example, PROT_NONE leaves it with only ACCESSED of the KERN_PGTABLE bits.

However... though follow_page() contains this and another test for huge
pages, so it's nice to keep it working on them, where does it actually get
called on a huge page?  get_user_pages() checks is_vm_hugetlb_page(vma) to
to call alternative hugetlb processing, as does unmap_vmas() and others.

Signed-off-by: Hugh Dickins 
Earlier-version-tested-by: Ingo Molnar 
Cc: Thomas Gleixner 
Cc: Jeff Chua 
Cc: Hans Rosenfeld 
Cc: Arjan van de Ven 
Signed-off-by: Linus Torvalds

slub: #ifdef simplification

2008-05-01T21:27:13+00:00

If we make SLUB_DEBUG depend on SYSFS then we can simplify some
#ifdefs and avoid others.

Signed-off-by: Christoph Lameter 
Signed-off-by: Pekka Enberg

slub: Whitespace cleanup and use of strict_strtoul

2008-05-01T21:26:31+00:00

Fix some issues with wrapping and use strict_strtoul to make parameter
passing from sysfs safer.

Signed-off-by: Christoph Lameter 
Signed-off-by: Pekka Enberg

memcg: simple stats for memory resource controller

2008-05-01T15:04:02+00:00

Implement trivial statistics for the memory resource controller.

Signed-off-by: Balaji Rao 
Acked-by: Balbir Singh 
Cc: Dhaval Giani 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

docbook: fix vmalloc missing parameter notation

2008-05-01T15:03:59+00:00

Fix vmalloc kernel-doc warning:

Warning(linux-2.6.25-git14//mm/vmalloc.c:555): No description found for parameter 'caller'

Signed-off-by: Randy Dunlap 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

remove div_long_long_rem

2008-05-01T15:03:58+00:00

x86 is the only arch right now, which provides an optimized for
div_long_long_rem and it has the downside that one has to be very careful that
the divide doesn't overflow.

The API is a little akward, as the arguments for the unsigned divide are
signed.  The signed version also doesn't handle a negative divisor and
produces worse code on 64bit archs.

There is little incentive to keep this API alive, so this converts the few
users to the new API.

Signed-off-by: Roman Zippel 
Cc: Ralf Baechle 
Cc: Ingo Molnar 
Cc: Thomas Gleixner 
Cc: john stultz 
Cc: Christoph Lameter 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

revert "memory hotplug: allocate usemap on the section with pgdat"

2008-04-30T15:29:55+00:00

This:

commit 86f6dae1377523689bd8468fed2f2dd180fc0560
Author: Yasunori Goto 
Date:   Mon Apr 28 02:13:33 2008 -0700

    memory hotplug: allocate usemap on the section with pgdat

    Usemaps are allocated on the section which has pgdat by this.

    Because usemap size is very small, many other sections usemaps are allocated
    on only one page.  If a section has usemap, it can't be removed until removing
    other sections.  This dependency is not desirable for memory removing.

    Pgdat has similar feature.  When a section has pgdat area, it must be the last
    section for removing on the node.  So, if section A has pgdat and section B
    has usemap for section A, Both sections can't be removed due to dependency
    each other.

    To solve this issue, this patch collects usemap on same section with pgdat.
    If other sections doesn't have any dependency, this section will be able to be
    removed finally.

    Signed-off-by: Yasunori Goto 
    Cc: Badari Pulavarty 
    Cc: Yinghai Lu 
    Cc: Yasunori Goto 
    Signed-off-by: Andrew Morton 
    Signed-off-by: Linus Torvalds 

broke davem's sparc64 bootup.  Revert it while we work out what went wrong.

Cc: Yasunori Goto 
Cc: Badari Pulavarty 
Cc: Yinghai Lu 
Cc: "David S. Miller" 
Cc: Heiko Carstens 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds