Permalink
Commits on Dec 19, 2010
  1. Merge branch 'configs-2.6.36' into pf-2.6.36

    Oleksandr Natalenko
    Oleksandr Natalenko committed Dec 19, 2010
  2. configs-2.6.36: update config for Dell Inspiron 1525 laptop

    Oleksandr Natalenko
    Oleksandr Natalenko committed Dec 19, 2010
    This commit removes support for reiserfs as it is not used on my laptop
    anymore. Also, it introduces i915 and intel_agp as modules in order to
    make kernel package on Arch Linux generated without warnings.
  3. Merge branch 'configs-2.6.36' into pf-2.6.36

    Oleksandr Natalenko
    Oleksandr Natalenko committed Dec 19, 2010
  4. configs-2.6.36: update Dell Inspiron 1525 config

    Oleksandr Natalenko
    Oleksandr Natalenko committed Dec 19, 2010
  5. Merge branch 'version-2.6.36' into pf-2.6.36

    Oleksandr Natalenko
    Oleksandr Natalenko committed Dec 19, 2010
  6. version-2.6.36: bump to v2.6.36-pf5

    Oleksandr Natalenko
    Oleksandr Natalenko committed Dec 19, 2010
  7. Merge remote branch 'tuxonice-2.6.36/combined' into pf-2.6.36

    Oleksandr Natalenko
    Oleksandr Natalenko committed Dec 19, 2010
Commits on Dec 18, 2010
  1. Extra atomic-copy time content recalculation

    Nigel Cunningham
    Nigel Cunningham committed Dec 18, 2010
    When preparing to do the atomic copy, we might find that the extra
    pages allowance the user gave wasn't sufficient. In such cases,
    we look to see if we can continue anyway, and allocate extra memory
    for the copy if we can. We should then also do a recalculation of
    the image contents, in case the allocation of extra memory included
    an implicit allocation of new slab pages, which should also be saved.
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Commits on Dec 17, 2010
  1. Disable readahead commandline switch.

    Nigel Cunningham
    Nigel Cunningham committed Dec 17, 2010
    Add a commandline switch for disabling readahead.
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
  2. Improve swap allocation speed.

    Nigel Cunningham
    Nigel Cunningham committed Dec 17, 2010
    Speed up the allocation of swap by using our own routine, which
    simply returns ranges of unused swapspace without (at least at
    the moment) worrying about wear levelling or seek times. We want
    contiguous blocks, and are much more concerned about users with
    large amounts (32GB) of swap seeing their systems take multiple
    minutes simply to allocate storage while the battery is running
    out. Wear leveling is important, and I'll seek to look at that
    soon too.
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Commits on Dec 16, 2010
  1. Implement new upstream functionality.

    Nigel Cunningham
    Nigel Cunningham committed Dec 16, 2010
    I've missed a change in upstream, and need to play catchup.
    
    pm_{restrict,restore}_gfp_mask was added in 2.6.36.
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
  2. Tidy setting of extras_entry->next

    Nigel Cunningham
    Nigel Cunningham committed Dec 16, 2010
    Simplify the code for setting extras_entry->next in
    toi_allocate_extra_pagedir_memory.
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
  3. Add commandline parameter for tracing allocations

    Nigel Cunningham
    Nigel Cunningham committed Dec 16, 2010
    Add a commandline parameter, toi_trace_allocs=<n>, for tracing
    allocations of a particular type. As part of this, rename the
    variable trace_allocs to toi_trace_allocs to greatly reduce
    the possibility of namespace clashes.
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
  4. Merge branch 'configs-2.6.36' into pf-2.6.36

    Oleksandr Natalenko
    Oleksandr Natalenko committed Dec 16, 2010
  5. configs-2.6.36: update config for Dell Inspiron 1525

    Oleksandr Natalenko
    Oleksandr Natalenko committed Dec 16, 2010
  6. Merge branch 'version-2.6.36' into pf-2.6.36

    Oleksandr Natalenko
    Oleksandr Natalenko committed Dec 16, 2010
  7. version-2.6.36: bump to v2.6.36-pf4

    Oleksandr Natalenko
    Oleksandr Natalenko committed Dec 16, 2010
  8. Merge branch 'ck-2.6.36' into pf-2.6.36

    Oleksandr Natalenko
    Oleksandr Natalenko committed Dec 16, 2010
  9. ck-2.6.36: update BFS to v360

    Oleksandr Natalenko
    Oleksandr Natalenko committed Dec 16, 2010
Commits on Dec 10, 2010
  1. Merge branch 'configs-2.6.36' into pf-2.6.36

    Oleksandr Natalenko
    Oleksandr Natalenko committed Dec 10, 2010
  2. configs-2.6.36: update config for Dell Inspiron 1525

    Oleksandr Natalenko
    Oleksandr Natalenko committed Dec 10, 2010
  3. Merge branch 'version-2.6.36' into pf-2.6.36

    Oleksandr Natalenko
    Oleksandr Natalenko committed Dec 10, 2010
  4. version-2.6.36: bump to v2.6.36-pf3

    Oleksandr Natalenko
    Oleksandr Natalenko committed Dec 10, 2010
  5. Merge remote branch 'tuxonice-2.6.36/combined' into pf-2.6.36

    Oleksandr Natalenko
    Oleksandr Natalenko committed Dec 10, 2010
  6. fix merge conflict

    Oleksandr Natalenko
    Oleksandr Natalenko committed Dec 10, 2010
  7. Merge branch 'stable' into combined

    Nigel Cunningham
    Nigel Cunningham committed Dec 10, 2010
Commits on Dec 9, 2010
  1. Linux 2.6.36.2

    gregkh committed Dec 9, 2010
  2. Un-inline get_pipe_info() helper function

    torvalds authored and gregkh committed Nov 29, 2010
    commit 7208364 upstream.
    
    This avoids some include-file hell, and the function isn't really
    important enough to be inlined anyway.
    
    Reported-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  3. Export 'get_pipe_info()' to other users

    torvalds authored and gregkh committed Nov 28, 2010
    commit c66fb34 upstream.
    
    And in particular, use it in 'pipe_fcntl()'.
    
    The other pipe functions do not need to use the 'careful' version, since
    they are only ever called for things that are already known to be pipes.
    
    The normal read/write/ioctl functions are called through the file
    operations structures, so if a file isn't a pipe, they'd never get
    called.  But pipe_fcntl() is special, and called directly from the
    generic fcntl code, and needs to use the same careful function that the
    splice code is using.
    
    Cc: Jens Axboe <jaxboe@fusionio.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: Dave Jones <davej@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  4. Rename 'pipe_info()' to 'get_pipe_info()'

    torvalds authored and gregkh committed Nov 28, 2010
    commit 71993e6 upstream.
    
    .. and change it to take the 'file' pointer instead of an inode, since
    that's what all users want anyway.
    
    The renaming is preparatory to exporting it to other users.  The old
    'pipe_info()' name was too generic and is already used elsewhere, so
    before making the function public we need to use a more specific name.
    
    Cc: Jens Axboe <jaxboe@fusionio.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: Dave Jones <davej@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  5. nmi: fix clock comparator revalidation

    heicarst authored and gregkh committed Nov 25, 2010
    commit e8129c6 upstream.
    
    On each machine check all registers are revalidated. The save area for
    the clock comparator however only contains the upper most seven bytes
    of the former contents, if valid.
    Therefore the machine check handler uses a store clock instruction to
    get the current time and writes that to the clock comparator register
    which in turn will generate an immediate timer interrupt.
    However within the lowcore the expected time of the next timer
    interrupt is stored. If the interrupt happens before that time the
    handler won't be called. In turn the clock comparator won't be
    reprogrammed and therefore the interrupt condition stays pending which
    causes an interrupt loop until the expected time is reached.
    
    On NOHZ machines this can result in unresponsive machines since the
    time of the next expected interrupted can be a couple of days in the
    future.
    
    To fix this just revalidate the clock comparator register with the
    expected value.
    In addition the special handling for udelay must be changed as well.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  6. r8169: fix checksum broken

    Shan Wei authored and gregkh committed Nov 12, 2010
    commit d5d3ebe upstream.
    
    If r8196 received packets with invalid sctp/igmp(not tcp, udp) checksum, r8196 set skb->ip_summed
    wit CHECKSUM_UNNECESSARY. This cause that upper protocol don't check checksum field.
    
    I am not family with r8196 driver. I try to guess the meaning of RxProtoIP and IPFail.
    RxProtoIP stands for received IPv4 packet that upper protocol is not tcp and udp.
    !(opts1 & IPFail) is true means that driver correctly to check checksum in IPv4 header.
    
    If it's right, I think we should not set ip_summed wit CHECKSUM_UNNECESSARY for my sctp packets
    with invalid checksum.
    
    If it's not right, please tell me.
    
    Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
    Acked-by: Francois Romieu <romieu@fr.zoreil.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  7. r8169: revert "Handle rxfifo errors on 8168 chips"

    françois romieu authored and gregkh committed Nov 8, 2010
    commit 53f5735 upstream.
    
    The original patch helps under obscure conditions (no pun) but
    some 8168 do not like it. The change needs to be tightened with
    a specific 8168 version.
    
    This reverts commit 801e147
    ("r8169: Handle rxfifo errors on 8168 chips").
    
    Regression at https://bugzilla.kernel.org/show_bug.cgi?id=20882
    
    Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
    Tested-by: Andreas Radke <a.radke@arcor.de>
    Cc: Matthew Garrett <mjg@redhat.com>
    Cc: Daniel J Blueman <daniel.blueman@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  8. r8169: (re)init phy on resume

    sgruszka authored and gregkh committed Oct 20, 2010
    commit fccec10 upstream.
    
    Fix switching device to low-speed mode after resume reported in:
    https://bugzilla.redhat.com/show_bug.cgi?id=502974
    
    Reported-and-tested-by: Laurentiu Badea <bugzilla-redhat@wotevah.com>
    Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Cc: Francois Romieu <romieu@fr.zoreil.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  9. r8169: fix rx checksum offload

    Eric Dumazet authored and gregkh committed Sep 6, 2010
    commit adea1ac upstream.
    
    While porting GRO to r8169, I found this driver has a bug in its rx
    path.
    
    All skbs given to network stack had their ip_summed set to
    CHECKSUM_NONE, while hardware said they had correct TCP/UDP checksums.
    
    The reason is driver sets skb->ip_summed on the original skb before the
    copy eventually done by copybreak. The fresh skb gets the ip_summed =
    CHECKSUM_NONE value, forcing network stack to recompute checksum, and
    preventing my GRO patch to work.
    
    Fix is to make the ip_summed setting after skb copy.
    
    Note : rx_copybreak current value is 16383, so all frames are copied...
    
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Acked-by: Francois Romieu <romieu@fr.zoreil.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>