1. 13 Jan, 2010 15 commits
    • Martin Schwidefsky's avatar
      [S390] duplicate SIGTRAP on signal delivery. · 6f50248e
      Martin Schwidefsky authored
      
      
      The code in do_signal sets the TIF_SINGLE_STEP bit and calls
      tracehook_signal_handler after the signal frame has been set up.
      This causes two SIGTRAP signals to be delivered to the tracer.
      Stop setting the TIF_SINGLE_STEP bit in do_signal to get the
      correct number of SIGTRAPs.
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      6f50248e
    • Martin Schwidefsky's avatar
      [S390] clear TIF_SINGLE_STEP for new process. · f8d5faf7
      Martin Schwidefsky authored
      
      
      Clear the TIF_SINGLE_STEP bit in copy_thread. The new process did not get
      a PER event of its own. It is wrong deliver a SIGTRAP that was meant for
      the parent process.
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      f8d5faf7
    • Martin Schwidefsky's avatar
      [S390] fix loading of PER control registers for utrace. · c3311c13
      Martin Schwidefsky authored
      
      
      If the current task enables / disables PER tracing for itself the
      PER control registers need to be loaded in FixPerRegisters.
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      c3311c13
    • Linus Torvalds's avatar
      Linux 2.6.33-rc4 · 7284ce6c
      Linus Torvalds authored
      7284ce6c
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/battery-2.6 · 53ff7095
      Linus Torvalds authored
      * git://git.infradead.org/battery-2.6:
        pmu_battery: Fix battery full reporting
      53ff7095
    • Bryn M. Reeves's avatar
      [SCSI] megaraid_sas: remove sysfs poll_mode_io world writeable permissions · bb7d3f24
      Bryn M. Reeves authored
      
      
      /sys/bus/pci/drivers/megaraid_sas/poll_mode_io defaults to being
      world-writable, which seems bad (letting any user affect kernel driver
      behavior).
      
      This turns off group and user write permissions, so that on typical
      production systems only root can write to it.
      Signed-off-by: default avatarBryn M. Reeves <bmr@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      bb7d3f24
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux · 90aeb7c0
      Linus Torvalds authored
      * 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
        OMAP: DSS2: OMAPFB: fix crash when panel driver was not loaded
        OMAP: DSS2: Reject scaling settings when they cannot be supported
        OMAP: DSS2: Make check-delay-loops consistent
        OMAP: DSS2: OMAPFB: fix omapfb_free_fbmem()
        video/omap: add __init/__exit macros to drivers/video/omap/lcd_htcherald.c
        OMAP: DSS2: Fix compile warning
        MAINTAINERS: Combine DSS2 and OMAPFB2 into one entry
        MAINTAINERS: change omapfb maintainer
        OMAP: OMAPFB: add dummy release function for omapdss
        OMAP: OMAPFB: fix clk_get for RFBI
        OMAP: DSS2: RFBI: convert to new kfifo API
        OMAP: DSS2: Fix crash when panel doesn't define enable_te()
        OMAP: DSS2: Collect interrupt statistics
        OMAP: DSS2: DSI: print debug DCS cmd in hex
        OMAP: DSS2: DSI: fix VC channels in send_short and send_null
      90aeb7c0
    • Dave Chinner's avatar
      lib: Introduce generic list_sort function · 2c761270
      Dave Chinner authored
      
      
      There are two copies of list_sort() in the tree already, one in the DRM
      code, another in ubifs.  Now XFS needs this as well.  Create a generic
      list_sort() function from the ubifs version and convert existing users
      to it so we don't end up with yet another copy in the tree.
      Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
      Acked-by: default avatarDave Airlie <airlied@redhat.com>
      Acked-by: default avatarArtem Bityutskiy <dedekind@infradead.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2c761270
    • Dave Jones's avatar
      remove my email address from checkpatch. · dbf004d7
      Dave Jones authored
      
      
      Maybe this will stop people emailing me about it.
      Signed-off-by: default avatarDave Jones <davej@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      dbf004d7
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 2d13c8f0
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        libata: retry link resume if necessary
        ata_piix: enable 32bit PIO on SATA piix
        sata_promise: don't classify overruns as HSM errors
      2d13c8f0
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 1f0e14bb
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        ARM: Ensure ARMv6/7 mm files are built using appropriate assembler options
        ARM: Fix wrong dmb
        ARM: 5874/1: serial21285: fix disable_irq-from-interrupt-handler deadlock
        ARM: 5873/1: ARM: Fix the reset logic for ARM RealView boards
        ARM: 5872/1: ARM: include needed linux/cpu.h in asm/cpu.h
        ARM: 5871/1: arch/arm: Fix build failure for lpd7a404_defconfig caused by missing includes
        ARM: 5870/1: arch/arm: Fix build failure for defconfigs without CONFIG_ISA_DMA_API set
        ARM: 5868/1: ARM: fix "BUG: using smp_processor_id() in preemptible code"
        ARM: 5867/1: Update U300 defconfig
        ARM: 5866/1: arm ptrace: use unsigned types for kernel pt_regs
        [ARM] pxa: fix strange characters in zaurus gpio .desc
        ARM: add missing recvmmsg syscall number
        [ARM] pxa: fix compiler warnings of unused variable 'id' in cpu_is_pxa9*()
        [ARM] pxa: update pwm_backlight->notify() to include missed 'struct device *'
        [ARM] pxa: enable L2 if present in XSC3
        [ARM] pxa: do not enable L2 after MMU is enabled
      1f0e14bb
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · f25bb39f
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (22 commits)
        MIPS: Ignore vmlinux.*
        MIPS: Move vmlinux.ecoff to arch/mips/boot
        MIPS: cpumask_of_node() should handle -1 as a node
        MIPS: Octeon: Use non-overflowing arithmetic in sched_clock
        MIPS: Malta, PowerTV: Remove unnecessary "Linux started"
        MIPS: BCM63xx: Remove duplicate CONFIG_CMDLINE.
        MIPS: AR7: Remove unused prom_getchar()
        MIPS: PowerTV: Remove extra r4k_clockevent_init() call
        MIPS: Cobalt use strlcat() for the command line arguments
        MIPS: Octeon: Add sched_clock() to csrc-octeon.c
        MIPS: TXx9: Cleanup builtin-cmdline processing
        MIPS: PowerTV: simplify prom_init_cmdline() and merge into prom_init()
        MIPS: PowerTV: Remove unused platform_die()
        MIPS: PowerTV: Remove mips_machine_halt()
        MIPS: PowerTV: Remove unused ptv_memsize
        MIPS: PowerTV: Remove unused prom_getcmdline()
        MIPS: AR7: Remove kgdb_enabled
        MIPS: Alchemy: Correct code taking the size of a pointer
        MIPS: BCM63xx: Fix whitespace damaged board_bcm963xx.c
        MIPS: VR41xx: Use strlcat() for the command line arguments
        ...
      f25bb39f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 7113578a
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: hda - Fix ALC861-VD capture source mixer
        ALSA: ac97: add AC97 STMicroelectronics' codecs
        ALSA: ac97: Add Dell Dimension 2400 to Headphone/Line Jack Sense blacklist
        ASoC: Fix WM8350 DSP mode B configuration
        sbawe: fix memory detection part 2
        sound: oss: off by one bug
        ALSA: usb-audio - Avoid Oops after disconnect
        ALSA: test off by one in setsamplerate()
        ALSA: atiixp: Specify codec for Foxconn RC4107MA-RS2
      7113578a
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 597d8c71
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (56 commits)
        sky2: Fix oops in sky2_xmit_frame() after TX timeout
        Documentation/3c509: document ethtool support
        af_packet: Don't use skb after dev_queue_xmit()
        vxge: use pci_dma_mapping_error to test return value
        netfilter: ebtables: enforce CAP_NET_ADMIN
        e1000e: fix and commonize code for setting the receive address registers
        e1000e: e1000e_enable_tx_pkt_filtering() returns wrong value
        e1000e: perform 10/100 adaptive IFS only on parts that support it
        e1000e: don't accumulate PHY statistics on PHY read failure
        e1000e: call pci_save_state() after pci_restore_state()
        netxen: update version to 4.0.72
        netxen: fix set mac addr
        netxen: fix smatch warning
        netxen: fix tx ring memory leak
        tcp: update the netstamp_needed counter when cloning sockets
        TI DaVinci EMAC: Handle emac module clock correctly.
        dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips
        ixgbe: Fix compiler warning about variable being used uninitialized
        netfilter: nf_ct_ftp: fix out of bounds read in update_nl_seq()
        mv643xx_eth: don't include cache padding in rx desc buffer size
        ...
      
      Fix trivial conflict in drivers/scsi/cxgb3i/cxgb3i_offload.c
      597d8c71
    • Greg Ungerer's avatar
      m68knommu: fix definitions of __pa() and __va() · 682137f7
      Greg Ungerer authored
      
      
      Fix compilation breakage of all m68knommu targets:
      
        CC      arch/m68knommu/kernel/asm-offsets.s
      In file included from include/linux/sched.h:77,
                       from arch/m68knommu/kernel/asm-offsets.c:12:
      include/linux/percpu.h: In function 'per_cpu_ptr_to_phys':
      include/linux/percpu.h:161: error: implicit declaration of function 'virt_to_phy
      
      This is broken in linux-2.6.33-rc3.
      
      Change the definitions of __pa() and __va() to not use virt_to_phys()
      and phys_to_virt(). Trivial 1:1 conversion required for the non-MMU case.
      
      A side effect if this is that the m68knommu can now use asm/virtconvert.h
      for the definition of virt_to_phys() and phys_to_virt().
      
      Also cleaned up the definition of page_to_phys() when moving into
      virtconvert.h.
      Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      682137f7
  2. 12 Jan, 2010 25 commits