1. 11 Feb, 2009 30 commits
  2. 10 Feb, 2009 10 commits
    • Kumar Gala's avatar
      powerpc/mm: Fix _PAGE_COHERENT support on classic ppc32 HW · f99fb8a2
      Kumar Gala authored
      The following commit:
      
      commit 64b3d0e8
      
      
      Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Date:   Thu Dec 18 19:13:51 2008 +0000
      
          powerpc/mm: Rework usage of _PAGE_COHERENT/NO_CACHE/GUARDED
      
      broke setting of the _PAGE_COHERENT bit in the PPC HW PTE.  Since we now
      actually set _PAGE_COHERENT in the Linux PTE we shouldn't be clearing it
      out before we propogate it to the PPC HW PTE.
      Reported-by: default avatarMartyn Welch <martyn.welch@gefanuc.com>
      Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      f99fb8a2
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 1385a7ae
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] AACI: timeout will reach -1
        [ARM] Storage class should be before const qualifier
        [ARM] pxa: stop and disable IRQ for each DMA channels at startup
        [ARM] pxa: make more SSCR0 bit definitions visible on multiple processors
        [ARM] pxa: fix missing of __REG() definition for ac97 registers access
        [ARM] pxa: fix NAND and MMC clock initialization for pxa3xx
      1385a7ae
    • Stefan Richter's avatar
      hugetlbfs: fix build failure with !CONFIG_HUGETLBFS · 1db8508c
      Stefan Richter authored
      Fix regression due to 5a6fe125
      
      ,
      "Do not account for the address space used by hugetlbfs using VM_ACCOUNT"
      which added an argument to the function hugetlb_file_setup() but not to
      the macro hugetlb_file_setup().
      Reported-by: default avatarChris Clayton <chris2553@googlemail.com>
      Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
      Acked-by: default avatarMel Gorman <mel@csn.ul.ie>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1db8508c
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · c36c63c5
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc: Add missing sparsemem.h include
        powerpc/pci: mmap anonymous memory when legacy_mem doesn't exist
        powerpc/cell: Add missing #include for oprofile
        powerpc/ftrace: Fix math to calculate offset in TOC
        powerpc: Don't emulate mr. instructions
        powerpc/fsl-booke: Fix mapping functions to use phys_addr_t
        arch/powerpc: Eliminate double sizeof
        powerpc/cpm2: Fix set interrupt type
        powerpc/83xx: Fix TSEC0 workability on MPC8313E-RDB boards
        powerpc/83xx: Fix missing #{address,size}-cells in mpc8313erdb.dts
        powerpc/83xx: Build breakage for CONFIG_PM but no CONFIG_SUSPEND
      c36c63c5
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · 226b7910
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
        sparc64: Fix probe_kernel_{read,write}().
        sparc64: Kill .fixup section bloat.
        sparc64: Don't hook up pcr_ops on spitfire chips.
        sparc64: Call dump_stack() in die_nmi().
      226b7910
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 29ef0117
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (23 commits)
        bridge: Fix LRO crash with tun
        IPv6: fix to set device name when new IPv6 over IPv6 tunnel device is created.
        gianfar: Fix boot hangs while bringing up gianfar ethernet
        netfilter: xt_sctp: sctp chunk mapping doesn't work
        netfilter: ctnetlink: fix echo if not subscribed to any multicast group
        netfilter: ctnetlink: allow changing NAT sequence adjustment in creation
        netfilter: nf_conntrack_ipv6: don't track ICMPv6 negotiation message
        netfilter: fix tuple inversion for Node information request
        netxen: fix msi-x interrupt handling
        de2104x: force correct order when writing to rx ring
        tun: Fix unicast filter overflow
        drivers/isdn: introduce missing kfree
        drivers/atm: introduce missing kfree
        sunhme: Don't match PCI devices in SBUS probe.
        9p: fix endian issues [attempt 3]
        net_dma: call dmaengine_get only if NET_DMA enabled
        3c509: Fix resume from hibernation for PnP mode.
        sungem: Soft lockup in sungem on Netra AC200 when switching interface up
        RxRPC: Fix a potential NULL dereference
        r8169: Don't update statistics counters when interface is down
        ...
      29ef0117
    • Mel Gorman's avatar
      Do not account for the address space used by hugetlbfs using VM_ACCOUNT · 5a6fe125
      Mel Gorman authored
      When overcommit is disabled, the core VM accounts for pages used by anonymous
      shared, private mappings and special mappings. It keeps track of VMAs that
      should be accounted for with VM_ACCOUNT and VMAs that never had a reserve
      with VM_NORESERVE.
      
      Overcommit for hugetlbfs is much riskier than overcommit for base pages
      due to contiguity requirements. It avoids overcommiting on both shared and
      private mappings using reservation counters that are checked and updated
      during mmap(). This ensures (within limits) that hugepages exist in the
      future when faults occurs or it is too easy to applications to be SIGKILLed.
      
      As hugetlbfs makes its own reservations of a different unit to the base page
      size, VM_ACCOUNT should never be set. Even if the units were correct, we would
      double account for the usage in the core VM and hugetlbfs. VM_NORESERVE may
      be set because an application can request no reserves be made for hugetlbfs
      at the risk of getting killed later.
      
      With commit fc8744ad
      
      , VM_NORESERVE and
      VM_ACCOUNT are getting unconditionally set for hugetlbfs-backed mappings. This
      breaks the accounting for both the core VM and hugetlbfs, can trigger an
      OOM storm when hugepage pools are too small lockups and corrupted counters
      otherwise are used. This patch brings hugetlbfs more in line with how the
      core VM treats VM_NORESERVE but prevents VM_ACCOUNT being set.
      Signed-off-by: default avatarMel Gorman <mel@csn.ul.ie>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5a6fe125
    • Steven Rostedt's avatar
      tracing, x86: fix fixup section to return to original code · e3944bfa
      Steven Rostedt authored
      
      
      Impact: fix to prevent a kernel crash on fault
      
      If for some reason the pointer to the parent function on the
      stack takes a fault, the fix up code will not return back to
      the original faulting code. This can lead to unpredictable
      results and perhaps even a kernel panic.
      
      A fault should not happen, but if it does, we should simply
      disable the tracer, warn, and continue running the kernel.
      It should not lead to a kernel crash.
      Signed-off-by: default avatarSteven Rostedt <srostedt@redhat.com>
      e3944bfa
    • Clemens Ladisch's avatar
      i8327: fix outb() parameter order · b52af409
      Clemens Ladisch authored
      
      
      In i8237A_resume(), when resetting the DMA controller, the parameters to
      dma_outb() were mixed up.
      Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
      [ cleaned up the file a tiny bit. ]
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      b52af409
    • Roel Kluin's avatar
      [ARM] AACI: timeout will reach -1 · f6f35bbe
      Roel Kluin authored
      
      
      With a postfix decrement the timeout will reach -1 rather than 0,
      so the warning will not be issued.
      Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      f6f35bbe