1. 14 Jan, 2009 36 commits
  2. 13 Jan, 2009 4 commits
    • Linus Torvalds's avatar
      Merge branch 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · a6525042
      Linus Torvalds authored
      * 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86 PAT: remove CPA WARN_ON for zero pte
        x86 PAT: return compatible mapping to remap_pfn_range callers
        x86 PAT: change track_pfn_vma_new to take pgprot_t pointer param
        x86 PAT: consolidate old memtype new memtype check into a function
        x86 PAT: remove PFNMAP type on track_pfn_vma_new() error
      a6525042
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · b9a0d06a
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        TWL4030: fix clk API usage
        [ARM] 5364/1: allow flush_ioremap_region() to be used from modules
        [ARM] w90x900: fix build errors and warnings
        [ARM] i.MX add missing include
        [ARM] i.MX: fix breakage from commit 27889273
        [ARM] i.MX: remove LCDC controller register definitions from imx-regs.h
      b9a0d06a
    • Bernd Schmidt's avatar
      Fix timeouts in sys_pselect7 · 62568510
      Bernd Schmidt authored
      Since we (Analog Devices) updated our Blackfin kernel to 2.6.28, we've
      seen occasional 5-second hangs from telnet.  telnetd calls select with a
      NULL timeout, but with the new kernel, the system call occasionally
      returns 0, which causes telnet to call sleep (5).  This did not happen
      with earlier kernels.
      
      The code in sys_pselect7 looks a bit strange, in particular the variable
      "to" is initialized to NULL, then changed if a non-null timeout was
      passed in, but not used further.  It needs to be passed to
      core_sys_select instead of &end_time.
      
      This bug was introduced by 8ff3e8e8
      ("select: switch select() and poll() over to hrtimers").
      Signed-off-by: default avatarBernd Schmidt <bernd.schmidt@analog.com>
      Reviewed-by: default avatarUlrich Drepper <drepper@redhat.com>
      Tested-by: default avatarRobin Getz <rgetz@blackfin.uclinux.org>
      Cc: stable@kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      62568510
    • Helge Deller's avatar
      fix early_serial_setup() regression · 125c97d8
      Helge Deller authored
      Commit b430428a ("8250: Don't clobber
      spinlocks.") introduced a regression on the parisc architecture, which
      broke the handover to the serial port at boottime.
      
      early_serial_setup() was changed to only copy a subset of the uart_port
      fields, and sadly the "type" and "line" fields were forgotten and thus
      the serial port was not initialized and could not be used for a
      handover.  This patch fixes this by copying the missing fields.
      
      As this change to early_serial_setup() doesn't need an initialized
      spinlock in the uart_port struct any longer, we can drop the spinlock
      initialization in the superio driver.
      
      Cc: David Daney <ddaney@caviumnetworks.com>
      Cc: Tomaso Paoletti <tpaoletti@caviumnetworks.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Acked-by: default avatarKyle McMartin <kyle@mcmartin.ca>
      Cc: linux-parisc@vger.kernel.org
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      125c97d8