1. 11 2月, 2009 6 次提交
    • M
      [S390] vdso: fix per cpu vdso pointer in lowcore · d5e842c4
      Martin Schwidefsky 提交于
      The vdso_per_cpu_data entry in the lowcore structure uses __u32
      instead of __u64. If the data page is above 4GB the pointer is
      truncated and the kernel crashes.
      Reported-by: NMijo Safradin <mijo@linux.vnet.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      d5e842c4
    • S
      hugetlbfs: fix build failure with !CONFIG_HUGETLBFS · 1db8508c
      Stefan Richter 提交于
      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: NChris Clayton <chris2553@googlemail.com>
      Signed-off-by: NStefan Richter <stefanr@s5r6.in-berlin.de>
      Acked-by: NMel Gorman <mel@csn.ul.ie>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      1db8508c
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · c36c63c5
      Linus Torvalds 提交于
      * '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
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · 226b7910
      Linus Torvalds 提交于
      * 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
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 29ef0117
      Linus Torvalds 提交于
      * 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
    • M
      Do not account for the address space used by hugetlbfs using VM_ACCOUNT · 5a6fe125
      Mel Gorman 提交于
      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: NMel Gorman <mel@csn.ul.ie>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      5a6fe125
  2. 10 2月, 2009 34 次提交