06 Aug, 2008

35 commits

  • I have a new PCI-E radeon RV380 series card (PCI device ID 5b64) that
    hangs in my sparc64 boxes when the init scripts set the font. The problem
    goes away if I disable acceleration.

    I haven't figured out that bug yet, but along the way I found some
    corrections to make based upon some auditing.

    1) The RB2D_DC_FLUSH_ALL value used by the kernel fb driver
    and the XORG video driver differ. I've made the kernel
    match what XORG is using.

    2) In radeonfb_engine_reset() we have top-level code structure
    that roughly looks like:

    if (family is 300, 350, or V350)
    do this;
    else
    do that;
    ...
    if (family is NOT 300, OR
    family is NOT 350, OR
    family is NOT V350)
    do another thing;

    this last conditional makes no sense, is always true,
    and obviously was likely meant to be "family is NOT
    300, 350, or V350". So I've made the code match the
    intent.

    Signed-off-by: David S. Miller
    Acked-by: Benjamin Herrenschmidt
    Tested-by: Benjamin Herrenschmidt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Miller
     
  • These functions have been deprecated for some time now but remained until
    all legacy callers could be removed. With a few commits in 2.6.26 this
    has happened so now we can remove these deprecated functions.

    Signed-off-by: Mark Asselstine
    Reviewed-by: Matthew Wilcox
    Cc: Alan Cox
    Cc: Ingo Molnar
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mark Asselstine
     
  • Add the missing MODULE_ALIAS() to the pwm_backlight driver.

    Cc: Russell King
    Signed-off-by: Ben Dooks
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ben Dooks
     
  • Make the error paths in the pwm_backlight driver more informative in the
    probe path, especially for the times that it finds an error.

    Cc: Russell King
    Signed-off-by: Ben Dooks
    Cc: Richard Purdie
    Acked-by: Krzysztof Helt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ben Dooks
     
  • …x of 1HZ and this same functionality is provided by UIE

    Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Cc: David Brownell <david-b@pacbell.net>
    Cc: Alessandro Zummo <a.zummo@towertech.it>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

    Mike Frysinger
     
  • Signed-off-by: Mike Frysinger
    Signed-off-by: Bryan Wu
    Cc: David Brownell
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mike Frysinger
     
  • Since we use the write complete interrupt, wait for it
    to complete before sleeping so we don't wake right back up due to it

    Signed-off-by: Mike Frysinger
    Signed-off-by: Bryan Wu
    Cc: David Brownell
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mike Frysinger
     
  • Signed-off-by: Mike Frysinger
    Signed-off-by: Bryan Wu
    Cc: David Brownell
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mike Frysinger
     
  • …et,clear} since it isnt needed (shaves off ~100bytes)

    Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
    Signed-off-by: Bryan Wu <bryan.wu@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Cc: David Brownell <david-b@pacbell.net>
    Cc: Alessandro Zummo <a.zummo@towertech.it>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

    Mike Frysinger
     
  • Signed-off-by: Mike Frysinger
    Signed-off-by: Bryan Wu
    Signed-off-by: Bryan Wu
    Cc: David Brownell
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mike Frysinger
     
  • Signed-off-by: Sonic Zhang
    Signed-off-by: Bryan Wu
    Signed-off-by: Bryan Wu
    Cc: David Brownell
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Sonic Zhang
     
  • …ll give us the same behavior of returning ENOTTY

    Signed-off-by: Mike Frysinger <michael.frysinger@analog.com>
    Signed-off-by: Bryan Wu <bryan.wu@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Cc: David Brownell <david-b@pacbell.net>
    Cc: Alessandro Zummo <a.zummo@towertech.it>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

    Mike Frysinger
     
  • While I'm glad to finally see the hole fixed whereby passing an invalid
    IRQ trigger type to request_irq() would be ignored, the current diagnostic
    isn't quite useful. Fixed by also listing the trigger type which was
    rejected.

    Signed-off-by: David Brownell
    Acked-by: Uwe Kleine-König
    Cc: Ingo Molnar
    Cc: Thomas Gleixner
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Brownell
     
  • Change __down_common() to use signal_pending_state() instead of open
    coding.

    The changes in kernel/semaphore.o are just artifacts, the state checks are
    optimized away.

    Signed-off-by: Oleg Nesterov
    Cc: Ingo Molnar
    Cc: Matthew Wilcox
    Cc: Roland McGrath
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Oleg Nesterov
     
  • In relay's current read implementation, if the buffer is completely full
    but hasn't triggered the buffer-full condition (i.e. the last write
    didn't cross the subbuffer boundary) and the last subbuffer is exactly
    full, the subbuffer accounting code erroneously finds nothing available.
    This patch fixes the problem.

    Signed-off-by: Tom Zanussi
    Cc: Eduard - Gabriel Munteanu
    Cc: Pekka Enberg
    Cc: Jens Axboe
    Cc: Mathieu Desnoyers
    Cc: Andrea Righi
    Cc: [2.6.25.x, 2.6.26.x]
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Tom Zanussi
     
  • This adds an SPI driver for the SPI controller found in various Marvell
    Orion ARM SoCs. It currently supports only one slave, which must use SPI
    mode 0.

    [dbrownell@users.sourceforge.net: cleanups, meet specs, pass "sparse"]
    Signed-off-by: Shadi Ammouri
    Signed-off-by: Saeed Bishara
    Signed-off-by: Lennert Buytenhek
    Signed-off-by: David Brownell
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Shadi Ammouri
     
  • curr_queue is a local variable in a for loop, and it's being initialized
    at the start of each loop. So any assignment at the end of the loop is
    pointless.

    Signed-off-by: Hannes Reinecke
    Cc: Mike Miller
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Hannes Reinecke
     
  • commit 20e061fb750d36ec0ffcb2e44ed7dafa9018223b
    Author: Ondrej Zajicek
    Date: Mon Apr 28 02:15:18 2008 -0700

    fbdev: framebuffer_alloc() fixes

    Correct the dev arg of framebuffer_alloc() in arkfb, s3fb and vt8623fb.

    causes a null-pointer deref because "info->dev is NULL, info was just
    kzallocated".

    Signed-off-by: Ondrej Zajicek
    Reported-by: "MadLoisae@gmx.net"
    Tested-by: "MadLoisae@gmx.net"
    Cc: Alexey Dobriyan
    Cc: "Antonino A. Daplas"
    Cc: Krzysztof Helt
    Cc: [2.6.26.x]
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ondrej Zajicek
     
  • The current implementation reports the structure name as
    VMCOREINFO_OSRELEASE in VMCOREINFO, e.g.

    VMCOREINFO_OSRELEASE=init_uts_ns.name.release

    That doesn't make sense because it's always the same. Instead, use the
    value, e.g.

    VMCOREINFO_OSRELEASE=2.6.26-rc3

    That's also what the 'makedumpfile -g' does.

    Signed-off-by: Bernhard Walle
    Cc: "Ken'ichi Ohmichi"
    Acked-by: Vivek Goyal
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Bernhard Walle
     
  • Signed-off-by: Anton Vorontsov
    Cc: Kumar Gala
    Cc: Wim Van Sebroeck
    Cc: Paul Mackerras
    Cc: Benjamin Herrenschmidt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Anton Vorontsov
     
  • gcc-3.2:

    mm/mm_init.c:77:1: directives may not be used inside a macro argument
    mm/mm_init.c:76:47: unterminated argument list invoking macro "mminit_dprintk"
    mm/mm_init.c: In function `mminit_verify_pageflags_layout':
    mm/mm_init.c:80: `mminit_dprintk' undeclared (first use in this function)
    mm/mm_init.c:80: (Each undeclared identifier is reported only once
    mm/mm_init.c:80: for each function it appears in.)
    mm/mm_init.c:80: syntax error before numeric constant

    Also fix a typo in a comment.

    Reported-by: Adrian Bunk
    Cc: Mel Gorman
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
    ide: ->cable_detect method cannot be marked __devinit
    ide: ->quirkproc method cannot be marked __devinit
    cs5520: add enablebits checking
    cdrom: don't check CDC_PLAY_AUDIO in cdrom_count_tracks()
    ide-cd: fix endianity for the error message in cdrom_read_capacity
    ide: remove CONFIG_IDE_MAX_HWIFS
    remove unneeded #include 's
    ide: fix regression caused by ide_device_{get,put}() addition (take 2)
    remove unnecessary includes
    ide: sanitize struct ide_port_ops documentation (take 2)
    ide: fix ide_fix_driveid()
    ide: fix pre-EIDE SWDMA support on big-endian

    Linus Torvalds
     
  • Okay, I found the cause of the hang. It is a simple bug in the USB
    scatter-gather library, caused by changes added in response to the S-G
    chaining modification.

    This patch (as1125) fixes a bug in the USB scatter-gather library.
    Early exit from the S-G initialization loop does not reset the count of
    outstanding URBs.

    Signed-off-by: Alan Stern
    Cc: Matthew Dharm
    Cc: David Brownell
    Cc: Alan Jenkins
    Cc: James Bottomley
    Cc: Greg KH
    Signed-off-by: Linus Torvalds

    Alan Stern
     
  • Now that we have warm-plug support ->cable_detect method no longer
    can be be marked __devinit.

    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • Now that we have warm-plug support ->quirkproc method no longer
    can be be marked __devinit.

    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • Based on sparse comments in OpenFirmware code
    (no Cx5510/Cx5520 datasheet here).

    This fixes 2.6.26 regression reported by TAKADA
    and caused by addition of warm-plug support.

    Tested-by: TAKADA Yoshihito
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • According to MMC-3 (or any later versions) READ TOCs are mandatory
    commands and have nothing to do with CDC_PLAY_AUDIO. I have no idea why
    the check was put there in the first place but it now only breaks
    automatic actions on certain drives.

    Note that this test was only effective when ide-cdrom was being used
    as sr didn't mask CDC_PLAY_AUDIO according to the capabilities.

    Signed-off-by: Tejun Heo
    Acked-by: Jens Axboe
    Cc: Borislav Petkov
    Signed-off-by: Andrew Morton
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Tejun Heo
     
  • Aesthetic regards aside, commit e8e7b9eb11c34ee18bde8b7011af41938d1ad667
    still leaves a bug in the error message, because it uses the unconverted
    big-endian value for printk.

    Fix this by using a local variable in machine byte order. The result is
    correct, more readable, and also produces slightly shorter code on i386.

    Signed-off-by: Petr Tesarik
    Cc: Jens Axboe
    Cc: Jan Kara
    Cc: Andrew Morton
    Cc:
    Acked-by: Borislav Petkov
    [bart: __u32 -> u32]
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Petr Tesarik
     
  • The benefits of a user settable CONFIG_IDE_MAX_HWIFS have become pretty
    tiny and are no longer considered worth the trouble of an own option.

    Simply always #define MAX_HWIFS to 10.

    Signed-off-by: Adrian Bunk
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Adrian Bunk
     
  • This patch remove unneeded #include 's.

    It also adds a required #include that was previously
    implicitely pulled by ide.h

    Signed-off-by: Adrian Bunk
    [bart: revert change to tests/lkdtm.c (spotted by Stephen Rothwell)]
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Adrian Bunk
     
  • On Monday 28 July 2008, Benjamin Herrenschmidt wrote:

    [...]

    > Vector: 300 (Data Access) at [c58b7b80]
    > pc: c014f264: elv_may_queue+0x10/0x44
    > lr: c0152750: get_request+0x2c/0x2c0
    > sp: c58b7c30
    > msr: 1032
    > dar: c
    > dsisr: 40000000
    > current = 0xc58aaae0
    > pid = 854, comm = media-bay
    > enter ? for help
    > mon> t
    > [c58b7c40] c0152750 get_request+0x2c/0x2c0
    > [c58b7c70] c0152a08 get_request_wait+0x24/0xec
    > [c58b7cc0] c0225674 ide_cd_queue_pc+0x58/0x1a0
    > [c58b7d40] c022672c ide_cdrom_packet+0x9c/0xdc
    > [c58b7d70] c0261810 cdrom_get_disc_info+0x60/0xd0
    > [c58b7dc0] c026208c cdrom_mrw_exit+0x1c/0x11c
    > [c58b7e30] c0260f7c unregister_cdrom+0x84/0xe8
    > [c58b7e50] c022395c ide_cd_release+0x80/0x84
    > [c58b7e70] c0163650 kref_put+0x54/0x6c
    > [c58b7e80] c0223884 ide_cd_put+0x40/0x5c
    > [c58b7ea0] c0211100 generic_ide_remove+0x28/0x3c
    > [c58b7eb0] c01e9d34 __device_release_driver+0x78/0xb4
    > [c58b7ec0] c01e9e44 device_release_driver+0x28/0x44
    > [c58b7ee0] c01e8f7c bus_remove_device+0xac/0xd8
    > [c58b7f00] c01e7424 device_del+0x104/0x198
    > [c58b7f20] c01e74d0 device_unregister+0x18/0x30
    > [c58b7f40] c02121c4 __ide_port_unregister_devices+0x6c/0x88
    > [c58b7f60] c0212398 ide_port_unregister_devices+0x38/0x80
    > [c58b7f80] c0208ca4 media_bay_step+0x1cc/0x5c0
    > [c58b7fb0] c0209124 media_bay_task+0x8c/0xcc
    > [c58b7fd0] c00485c0 kthread+0x48/0x84
    > [c58b7ff0] c0011b20 kernel_thread+0x44/0x60

    The guilty commit turned out to be 08da591e14cf87247ec09b17c350235157a92fc3
    ("ide: add ide_device_{get,put}() helpers"). ide_device_put() is called
    before kref_put() in ide_cd_put() so IDE device is already gone by the time
    ide_cd_release() is reached.

    Fix it by calling ide_device_get() before kref_get() and ide_device_put()
    after kref_put() in all affected device drivers.

    v2:
    Brown paper bag time. In v1 cd->drive was referenced after dropping last
    reference on cd object (which could result in OOPS in ide_device_put() as
    reported/debugged by Mariusz Kozlowski). Fix it by caching cd->drive in
    the local variable (fix other device drivers too).

    Reported-by: Benjamin Herrenschmidt
    Reported-by: Mariusz Kozlowski
    Cc: FUJITA Tomonori
    Cc: Borislav Petkov
    Tested-by: Mariusz Kozlowski
    Tested-by: Benjamin Herrenschmidt
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • Following files don't need at all:

    - arch/mips/jazz/setup.c
    - arch/sh/boards/mach-systemh/irq.c
    - drivers/macintosh/mediabay.c
    - drivers/scsi/hptiop.c
    - drivers/usb/storage/freecom.c
    - arch/powerpc/include/asm/ide.h
    - init/main.c

    Cc: Christoph Hellwig
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • v2:
    Add missing '@'-s. (Noticed by Randy Dunlap)

    Cc: Randy Dunlap
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • Fix byte-swapping for id->words161_175[], id->words206_254[]
    and id->words206_254[].

    Luckily all words previously left in little-endian byte-order
    are marked as reserved so this fix shouldn't affect user-space
    applications.

    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • id->tDMA is of 'unsigned char' type so endianness is already
    correct and calling le16_to_cpu() is wrong.

    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     

05 Aug, 2008

5 commits

  • Like the page lock change, this also requires name change, so convert the
    raw test_and_set bitop to a trylock.

    Signed-off-by: Nick Piggin
    Signed-off-by: Linus Torvalds

    Nick Piggin
     
  • Converting page lock to new locking bitops requires a change of page flag
    operation naming, so we might as well convert it to something nicer
    (!TestSetPageLocked_Lock => trylock_page, SetPageLocked => set_page_locked).

    This also facilitates lockdeping of page lock.

    Signed-off-by: Nick Piggin
    Acked-by: KOSAKI Motohiro
    Acked-by: Peter Zijlstra
    Acked-by: Andrew Morton
    Acked-by: Benjamin Herrenschmidt
    Signed-off-by: Linus Torvalds

    Nick Piggin
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
    sparc64: Remove all cpumask_t local variables in xcall dispatch.
    sparc64: Kill error_mask from hypervisor_xcall_deliver().
    sparc64: Build cpu list and mondo block at top-level xcall_deliver().
    sparc64: Disable local interrupts around xcall_deliver_impl() invocation.
    sparc64: Make all xcall_deliver's go through common helper function.
    sparc64: Always allocate the send mondo blocks, even on non-sun4v.
    sparc64: Make smp_cross_call_masked() take a cpumask_t pointer.
    sparc64: Directly call xcall_deliver() in smp_start_sync_tick_client.
    sparc64: Call xcall_deliver() directly in some cases.
    sparc64: Use cpumask_t pointers and for_each_cpu_mask_nr() in xcall_deliver.
    sparc64: Use xcall_deliver() consistently.
    sparc64: Use function pointer for cross-call sending.
    arch/sparc64/kernel/signal.c: removed duplicated #include
    sparc64: Need to disable preemption around smp_tsb_sync().

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (29 commits)
    sh: enable maple_keyb in dreamcast_defconfig.
    SH2(A) cache update
    nommu: Provide vmalloc_exec().
    add addrespace definition for sh2a.
    sh: Kill off ARCH_SUPPORTS_AOUT and remnants of a.out support.
    sh: define GENERIC_HARDIRQS_NO__DO_IRQ.
    sh: define GENERIC_LOCKBREAK.
    sh: Save NUMA node data in vmcore for crash dumps.
    sh: module_alloc() should be using vmalloc_exec().
    sh: Fix up __bug_table handling in module loader.
    sh: Add documentation and integrate into docbook build.
    sh: Fix up broken kerneldoc comments.
    maple: Kill useless private_data pointer.
    maple: Clean up maple_driver_register/unregister routines.
    input: Clean up maple keyboard driver
    maple: allow removal and reinsertion of keyboard driver module
    sh: /proc/asids depends on MMU.
    arch/sh/boards/mach-se/7343/irq.c: removed duplicated #include
    arch/sh/boards/board-ap325rxa.c: removed duplicated #include
    sh/boards/Makefile typo fix
    ...

    Linus Torvalds
     
  • * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
    powerpc: Remove use of CONFIG_PPC_MERGE
    powerpc: Force printing of 'total_memory' to unsigned long long
    powerpc: Fix compiler warning in arch/powerpc/mm/mem.c
    powerpc: Move include files to arch/powerpc/include/asm

    Linus Torvalds