Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Nov 2, 2008
  1. @torvalds

    Linux v2.6.28-rc3

    torvalds authored
  2. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
      ide-gd: re-get capacity on revalidate
      tx4938ide: Avoid underflow on calculation of a wait cycle
      tx4938ide: Do not call devm_ioremap for whole 128KB
      tx4938ide: Check minimum cycle time and SHWT range (v2)
      ide: Switch to a common address
      ide-cd: fix DMA alignment regression
  3. @bzolnier

    ide-gd: re-get capacity on revalidate

    Borislav Petkov authored bzolnier committed
    We need to re-get a removable media's capacity when revalidating the
    disk so that its partitions get rescanned by the block layer.
    
    Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
    Cc: Tejun Heo <tj@kernel.org>
    Cc: axboe@kernel.dk
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  4. @bzolnier

    tx4938ide: Avoid underflow on calculation of a wait cycle

    Atsushi Nemoto authored bzolnier committed
    Make 'wt' variable signed while it can be negative during calculation.
    
    Suggested-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Cc: sshtylyov@ru.mvista.com
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  5. @bzolnier

    tx4938ide: Do not call devm_ioremap for whole 128KB

    Atsushi Nemoto authored bzolnier committed
    Call devm_ioremap() for CS0 and CS1 separetely.
    And some style cleanups.
    
    Suggested-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Cc: ralf@linux-mips.org
    Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  6. @bzolnier

    tx4938ide: Check minimum cycle time and SHWT range (v2)

    Atsushi Nemoto authored bzolnier committed
    SHWT value is used as address valid to -CSx assertion and -CSx to -DIOx
    assertion setup time, and contrarywise, -DIOx to -CSx release and -CSx
    release to address invalid hold time, so it actualy applies 4 times and
    so constitutes -DIOx recovery time.  Check requirement of the recovery
    time and cycle time.  Also check SHWT maximum value.
    
    Suggested-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Cc: ralf@linux-mips.org
    Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  7. @Alan-Cox @bzolnier

    ide: Switch to a common address

    Alan-Cox authored bzolnier committed
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  8. @bzolnier

    ide-cd: fix DMA alignment regression

    Borislav Petkov authored bzolnier committed
    e5318b5 ("ide: use the dma safe check for
    REQ_TYPE_ATA_PC") introduced a regression which caused some ATAPI drives to
    turn off DMA for REQ_TYPE_BLOCK_PC commands while burning and thus degrading
    performance and ultimately causing an excessive amount of underruns.
    
    The issue is documented also in:
    http://bugzilla.kernel.org/show_bug.cgi?id=11742.
    
    Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
    Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Tested-by: Valerio Passini <valerio.passini@unicam.it>
    [bart: fixup patch description per comments from Sergei Shtylyov]
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  9. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Fix PCI resource mapping on sparc64
      sparc64: Kill annoying warning when building compat_binfmt_elf.o
      sparc32: kernel/trace/trace.c wants DIE_OOPS
      sparc64: Fix __copy_{to,from}_user_inatomic defines.
  10. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (33 commits)
      af_unix: netns: fix problem of return value
      IRDA: remove double inclusion of module.h
      udp: multicast packets need to check namespace
      net: add documentation for skb recycling
      key: fix setkey(8) policy set breakage
      bpa10x: free sk_buff with kfree_skb
      xfrm: do not leak ESRCH to user space
      net: Really remove all of LOOPBACK_TSO code.
      netfilter: nf_conntrack_proto_gre: switch to register_pernet_gen_subsys()
      netns: add register_pernet_gen_subsys/unregister_pernet_gen_subsys
      net: delete excess kernel-doc notation
      pppoe: Fix socket leak.
      gianfar: Don't reset TBI<->SerDes link if it's already up
      gianfar: Fix race in TBI/SerDes configuration
      at91_ether: request/free GPIO for PHY interrupt
      amd8111e: fix dma_free_coherent context
      atl1: fix vlan tag regression
      SMC91x: delete unused local variable "lp"
      myri10ge: fix stop/go mmio ordering
      bonding: fix panic when taking bond interface down before removing module
      ...
  11. @torvalds

    linux/string.h: fix comment typo

    Jeff Garzik authored torvalds committed
    s/user/used/
    
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. @davem330

    sparc64: Fix PCI resource mapping on sparc64

    Max Dmitrichenko authored davem330 committed
    There is a problem discovered in recent versions of ATI Mach64 driver
    in X.org on sparc64 architecture. In short, the driver fails to mmap
    MMIO aperture (PCI resource #2).
    
    I've found that kernel's __pci_mmap_make_offset() returns EINVAL. It
    checks whether user attempts to mmap more than the resource length,
    which is 0x1000 bytes in our case. But PAGE_SIZE on SPARC64 is 0x2000
    and this is what actually is being mmaped. So __pci_mmap_make_offset()
    failed for this PCI resource.
    
    Signed-off-by: Max Dmitrichenko <dmitrmax@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  13. @davem330

    sparc64: Kill annoying warning when building compat_binfmt_elf.o

    davem330 authored
    GCC warns because some tests against 32-bit values never evaluate to
    true due to how TASK_SIZE is defined.
    
    I always wanted to mimick powerpc's definition of TASK_SIZE, which
    is simply TASK_SIZE_OF(current) and that also fixes the warning.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  14. @davem330

    sparc32: kernel/trace/trace.c wants DIE_OOPS

    Al Viro authored davem330 committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  15. @davem330

    sparc64: Fix __copy_{to,from}_user_inatomic defines.

    Hugh Dickins authored davem330 committed
    Alexander Beregalov reports oops in __bzero() called from
    copy_from_user_fixup() called from iov_iter_copy_from_user_atomic(),
    when running dbench on tmpfs on sparc64: its __copy_from_user_inatomic
    and __copy_to_user_inatomic should be avoiding, not calling, the fixups.
    
    Signed-off-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  16. @davem330

    af_unix: netns: fix problem of return value

    Jianjun Kong authored davem330 committed
    fix problem of return value
    
    net/unix/af_unix.c: unix_net_init()
    when error appears, it should return 'error', not always return 0.
    
    Signed-off-by: Jianjun Kong <jianjun@zeuux.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  17. @alexb0 @davem330

    IRDA: remove double inclusion of module.h

    alexb0 authored davem330 committed
    Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  18. @davem330

    udp: multicast packets need to check namespace

    Eric Dumazet authored davem330 committed
    Current UDP multicast delivery is not namespace aware.
    
    Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
    Acked-by: Pavel Emelyanov <xemul@openvz.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  19. @davem330

    net: add documentation for skb recycling

    Stephen Hemminger authored davem330 committed
    Commit 04a4bb5 ("net: add
    skb_recycle_check() to enable netdriver skb recycling") added a
    method for network drivers to recycle skbuffs, but while use of
    this mechanism was documented in the commit message, it should
    really have been added as a docbook comment as well -- this
    patch does that.
    
    Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
    Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
Commits on Nov 1, 2008
  1. @torvalds

    sparc32: kernel/trace/trace.c wants DIE_OOPS

    Al Viro authored torvalds committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. @torvalds

    el3_common_init() should be __devinit, not __init

    Al Viro authored torvalds committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @torvalds

    missing dependencies on HAVE_CLK in drivers/mfd

    Al Viro authored torvalds committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. @torvalds

    section fixes for cirrusfb

    Al Viro authored torvalds committed
    cirrusfb_zorro_unmap() may be called both from __devexit and (on
    cleanup path) from __devinit.  So it needs to be a normal function,
    same as for cirrusfb_pci_unmap()
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @torvalds

    PM_TEST_SUSPEND should depend on RTC_CLASS, not RTC_LIB

    Al Viro authored torvalds committed
    Insufficient dependency - we really want CONFIG_RTC_CLASS=y there.
    That will give us CONFIG_RTC_LIB=y, so the old dependency can be
    simply replaced.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @torvalds

    oss: fix O_NONBLOCK in dmasound_core

    Al Viro authored torvalds committed
    We broke O_NONBLOCK handling in OSS dmasound_core in 2.3.11-pre3 - the
    original code copied f_flags to open_mode and then checked for
    O_NONBLOCK in there, but that got changed to copying f_mode and
    O_NONBLOCK has not reached that field in any kernel version.
    
    Since we do not care for any other bits, the fix is obvious...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. @torvalds

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    torvalds authored
    …nux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: fix AMDC1E and XTOPOLOGY conflict in cpufeature
      x86: build fix
  8. @torvalds

    init/do_mounts_md.c: remove duplicated #include

    Huang Weiyi authored torvalds committed
    Removed duplicated #include <linux/delay.h> in init/do_mounts_md.c.
    
    The same compile error ("error: implicit declaration of function
    'msleep'") got fixed twice:
    
     - f8b77d3 ("init/do_mounts_md.c:
       msleep compile fix")
    
     - 73b4a24 ("init/do_mounts_md.c must
       #include <linux/delay.h>")
    
    by people adding the <linux/delay.h> include in two slightly different
    places.  Andrew's quilt scripts happily ignore the fuzz, and will
    re-apply the patch even though they had conflicts.
    
    Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. @torvalds

    x86: Clean up late e820 resource allocation

    torvalds authored
    This makes the late e820 resources use 'insert_resource_expand_to_fit()'
    instead of doing a 'reserve_region_with_split()', and also avoids
    marking them as IORESOURCE_BUSY.
    
    This results in us being perfectly happy to use pre-existing PCI
    resources even if they were marked as being in a reserved region, while
    still avoiding any _new_ allocations in the reserved regions.  It also
    makes for a simpler and more accurate resource tree.
    
    Example resource allocation from Jonathan Corbet, who has firmware that
    has an e820 reserved entry that covered a big range (e0000000-fed003ff),
    and that had various PCI resources in it set up by firmware.
    
    With old kernels, the reserved range would force us to re-allocate all
    pre-existing PCI resources, and his reserved range would end up looking
    like this:
    
    	e0000000-fed003ff : reserved
    	  fec00000-fec00fff : IOAPIC 0
    	  fed00000-fed003ff : HPET 0
    
    where only the pre-allocated special regions (IOAPIC and HPET) were kept
    around.
    
    With 2.6.28-rc2, which uses 'reserve_region_with_split()', Jonathan's
    resource tree looked like this:
    
    	e0000000-fe7fffff : reserved
    	fe800000-fe8fffff : PCI Bus 0000:01
    	 fe800000-fe8fffff : reserved
    	fe900000-fe9d9aff : reserved
    	fe9d9b00-fe9d9bff : 0000:00:1f.3
    	 fe9d9b00-fe9d9bff : reserved
    	fe9d9c00-fe9d9fff : 0000:00:1a.7
    	 fe9d9c00-fe9d9fff : reserved
    	fe9da000-fe9dafff : 0000:00:03.3
    	 fe9da000-fe9dafff : reserved
    	fe9db000-fe9dbfff : 0000:00:19.0
    	 fe9db000-fe9dbfff : reserved
    	fe9dc000-fe9dffff : 0000:00:1b.0
    	 fe9dc000-fe9dffff : reserved
    	fe9e0000-fe9fffff : 0000:00:19.0
    	 fe9e0000-fe9fffff : reserved
    	fea00000-fea7ffff : 0000:00:02.0
    	 fea00000-fea7ffff : reserved
    	fea80000-feafffff : 0000:00:02.1
    	 fea80000-feafffff : reserved
    	feb00000-febfffff : 0000:00:02.0
    	 feb00000-febfffff : reserved
    	fec00000-fed003ff : reserved
    	 fec00000-fec00fff : IOAPIC 0
    	 fed00000-fed003ff : HPET 0
    
    and because the reserved entry had been split and moved into the
    individual resources, and because it used the IORESOURCE_BUSY flag, the
    drivers that actually wanted to _use_ those resources couldn't actually
    attach to them:
    
    	e1000e 0000:00:19.0: BAR 0: can't reserve mem region [0xfe9e0000-0xfe9fffff]
    	HDA Intel 0000:00:1b.0: BAR 0: can't reserve mem region [0xfe9dc000-0xfe9dffff]
    
    with this patch, the resource tree instead becomes
    
    	e0000000-fed003ff : reserved
    	  fe800000-fe8fffff : PCI Bus 0000:01
    	  fe9d9b00-fe9d9bff : 0000:00:1f.3
    	  fe9d9c00-fe9d9fff : 0000:00:1a.7
    	    fe9d9c00-fe9d9fff : ehci_hcd
    	  fe9da000-fe9dafff : 0000:00:03.3
    	  fe9db000-fe9dbfff : 0000:00:19.0
    	    fe9db000-fe9dbfff : e1000e
    	  fe9dc000-fe9dffff : 0000:00:1b.0
    	    fe9dc000-fe9dffff : ICH HD audio
    	  fe9e0000-fe9fffff : 0000:00:19.0
    	    fe9e0000-fe9fffff : e1000e
    	  fea00000-fea7ffff : 0000:00:02.0
    	  fea80000-feafffff : 0000:00:02.1
    	  feb00000-febfffff : 0000:00:02.0
    	  fec00000-fec00fff : IOAPIC 0
    	  fed00000-fed003ff : HPET 0
    
    ie the one reserved region now ends up surrounding all the PCI resources
    that were allocated inside of it by firmware, and because it is not
    marked BUSY, drivers have no problem attaching to the pre-allocated
    resources.
    
    Reported-and-tested-by: Jonathan Corbet <corbet@lwn.net>
    Cc: Yinghai Lu <yinghai@kernel.org>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Robert Hancock <hancockr@shaw.ca>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  10. @torvalds

    reserve_region_with_split: Fix GFP_KERNEL usage under spinlock

    torvalds authored
    This one apparently doesn't generate any warnings, because the function
    is only used during system bootup, when the warnings are disabled.  But
    it's still very wrong.
    
    The __reserve_region_with_split() function is called with the
    resource_lock held for writing, so it must only ever do GFP_ATOMIC
    allocations.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. @torvalds

    Merge branch 'link_removal' of git://www.jni.nu/cris

    torvalds authored
    * 'link_removal' of git://www.jni.nu/cris:
      [CRIS] Remove links from CRIS build
      [CRIS] Merge asm-offsets.c for both arches into one file.
  12. @torvalds

    Merge branch 'cris_move' of git://www.jni.nu/cris

    torvalds authored
    * 'cris_move' of git://www.jni.nu/cris:
      [CRIS] Move header files from include to arch/cris/include.
      [CRISv32] Remove warning in io.h
  13. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/jmorris/security-testing-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
      SELinux: properly handle empty tty_files list
  14. @torvalds

    remove unused #include <version.h>'s

    Huang Weiyi authored torvalds committed
    The file(s) below do not use LINUX_VERSION_CODE nor KERNEL_VERSION.
      drivers/leds/leds-hp-disk.c
      drivers/misc/panasonic-laptop.c
    
    This patch removes the said #include <version.h>.
    
    Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. @torvalds

    saner FASYNC handling on file close

    Al Viro authored torvalds committed
    As it is, all instances of ->release() for files that have ->fasync()
    need to remember to evict file from fasync lists; forgetting that
    creates a hole and we actually have a bunch that *does* forget.
    
    So let's keep our lives simple - let __fput() check FASYNC in
    file->f_flags and call ->fasync() there if it's been set.  And lose that
    crap in ->release() instances - leaving it there is still valid, but we
    don't have to bother anymore.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. @torvalds

    file caps: always start with clear bprm->caps_*

    Serge Hallyn authored torvalds committed
    While Linux doesn't honor setuid on scripts.  However, it mistakenly
    behaves differently for file capabilities.
    
    This patch fixes that behavior by making sure that get_file_caps()
    begins with empty bprm->caps_*.  That way when a script is loaded,
    its bprm->caps_* may be filled when binfmt_misc calls prepare_binprm(),
    but they will be cleared again when binfmt_elf calls prepare_binprm()
    next to read the interpreter's file capabilities.
    
    Signed-off-by: Serge Hallyn <serue@us.ibm.com>
    Acked-by: David Howells <dhowells@redhat.com>
    Acked-by: Andrew G. Morgan <morgan@kernel.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Something went wrong with that request. Please try again.