1. 13 Dec, 2006 11 commits
  2. 12 Dec, 2006 26 commits
    • Nicolas Pitre's avatar
      [PATCH] remove config ordering/dependency between ucb1400-ts and sound subsystem · e1036502
      Nicolas Pitre authored
      Commit 2d4ba4a3 introduced a dependency
      that was never meant to exist when the ac97_bus.c module was created.
      Move ac97_bus.c up the directory hierarchy to make sure it is built when
      selected even if sound is configured out so things work as originally
      intended.
      Signed-off-by: default avatarNicolas Pitre <nico@cam.org>
      Acked-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      e1036502
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 · 741441ab
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
        [patch 3/3] OCFS2 Configurable timeouts - Protocol changes
        [patch 2/3] OCFS2 Configurable timeouts
        [patch 1/3] OCFS2 - Expose struct o2nm_cluster
        ocfs2: Synchronize feature incompat flags in ocfs2_fs.h
        ocfs2: update mount option documentation
        ocfs2: local mounts
      741441ab
    • Linus Torvalds's avatar
      Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 · 659dba34
      Linus Torvalds authored
      * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
        i2c: Fix OMAP clock prescaler to match the comment
        i2c: Refactor a kfree in i2c-dev
        i2c: Fix return value check in i2c-dev
        i2c: Enable PEC on more i2c-i801 devices
        i2c: Discard the i2c algo del_bus wrappers
        i2c: New ARM Versatile/Realview bus driver
        i2c: fix broken ds1337 initialization
        i2c: i2c-i801 documentation update
        i2c: Use the __ATTR macro where possible
        i2c: Whitespace cleanups
        i2c: Use put_user instead of copy_to_user where possible
        i2c: New Atmel AT91 bus driver
        i2c: Add support for nested i2c bus locking
        i2c: Cleanups to the i2c-nforce2 bus driver
        i2c: Add request/release_mem_region to i2c-ibm_iic bus driver
        i2c: New Philips PNX bus driver
        i2c: Delete the broken i2c-ite bus driver
        i2c: Update the list of driver IDs
        i2c: Fix documentation typos
      659dba34
    • Ingo Molnar's avatar
      [PATCH] netpoll: fix netpoll lockup · 3640543d
      Ingo Molnar authored
      current -git doesnt boot on my laptop due to netpoll not unlocking the
      tx lock in the else branch.
      
      booted this up on my laptop with lockdep enabled and there are no
      locking complaints and it works fine.
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      3640543d
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 · d224a93d
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: (29 commits)
        sh: Fixup SH-2 BUG() trap handling.
        sh: Use early_param() for earlyprintk parsing.
        sh: Fix .empty_zero_page alignment for PAGE_SIZE > 4096.
        sh: Fixup .data.page_aligned.
        sh: Hook up SH7722 scif ipr interrupts.
        sh: Fixup sh_bios() trap handling.
        sh: SH-MobileR SH7722 CPU support.
        sh: Fixup dma_cache_sync() callers.
        sh: Convert remaining remap_area_pages() users to ioremap_page_range().
        sh: Fixup kernel_execve() for syscall cleanups.
        sh: Fix get_wchan().
        sh: BUG() handling through trapa vector.
        rtc: rtc-sh: alarm support.
        rtc: rtc-sh: fix rtc for out-by-one for the month.
        sh: Kill off unused SE7619 I/O ops.
        serial: sh-sci: Shut up various sci_rxd_in() gcc4 warnings.
        sh: Split out atomic ops logically.
        sh: Fix Solution Engine 7619 build.
        sh: Trivial build fixes for SH-2 support.
        sh: IPR IRQ updates for SH7619/SH7206.
        ...
      d224a93d
    • Ingo Molnar's avatar
      [PATCH] net, 8139too.c: fix netpoll deadlock · b57bd066
      Ingo Molnar authored
      fix deadlock in the 8139too driver: poll handlers should never forcibly
      enable local interrupts, because they might be used by netpoll/printk
      from IRQ context.
      
        =================================
        [ INFO: inconsistent lock state ]
        2.6.19 #11
        ---------------------------------
        inconsistent {softirq-on-W} -> {in-softirq-W} usage.
        swapper/1 [HC0[0]:SC1[1]:HE1:SE0] takes:
         (&npinfo->poll_lock){-+..}, at: [<c0350a41>] net_rx_action+0x64/0x1de
        {softirq-on-W} state was registered at:
          [<c0134c86>] mark_lock+0x5b/0x39c
          [<c0135012>] mark_held_locks+0x4b/0x68
          [<c01351e9>] trace_hardirqs_on+0x115/0x139
          [<c02879e6>] rtl8139_poll+0x3d7/0x3f4
          [<c035c85d>] netpoll_poll+0x82/0x32f
          [<c035c775>] netpoll_send_skb+0xc9/0x12f
          [<c035cdcc>] netpoll_send_udp+0x253/0x25b
          [<c0288463>] write_msg+0x40/0x65
          [<c011cead>] __call_console_drivers+0x45/0x51
          [<c011cf16>] _call_console_drivers+0x5d/0x61
          [<c011d4fb>] release_console_sem+0x11f/0x1d8
          [<c011d7d7>] register_console+0x1ac/0x1b3
          [<c02883f8>] init_netconsole+0x55/0x67
          [<c010040c>] init+0x9a/0x24e
          [<c01049cf>] kernel_thread_helper+0x7/0x10
          [<ffffffff>] 0xffffffff
        irq event stamp: 819992
        hardirqs last  enabled at (819992): [<c0350a16>] net_rx_action+0x39/0x1de
        hardirqs last disabled at (819991): [<c0350b1e>] net_rx_action+0x141/0x1de
        softirqs last  enabled at (817552): [<c01214e4>] __do_softirq+0xa3/0xa8
        softirqs last disabled at (819987): [<c0106051>] do_softirq+0x5b/0xc9
      
        other info that might help us debug this:
        no locks held by swapper/1.
      
        stack backtrace:
         [<c0104d88>] dump_trace+0x63/0x1e8
         [<c0104f26>] show_trace_log_lvl+0x19/0x2e
         [<c010532d>] show_trace+0x12/0x14
         [<c0105343>] dump_stack+0x14/0x16
         [<c0134980>] print_usage_bug+0x23c/0x246
         [<c0134d33>] mark_lock+0x108/0x39c
         [<c01356a7>] __lock_acquire+0x361/0x9ed
         [<c0136018>] lock_acquire+0x56/0x72
         [<c03aff1f>] _spin_lock+0x35/0x42
         [<c0350a41>] net_rx_action+0x64/0x1de
         [<c0121493>] __do_softirq+0x52/0xa8
         [<c0106051>] do_softirq+0x5b/0xc9
         [<c0121338>] irq_exit+0x3c/0x48
         [<c0106163>] do_IRQ+0xa4/0xbd
         [<c01047c6>] common_interrupt+0x2e/0x34
         [<c011db92>] vprintk+0x2c0/0x309
         [<c011dbf6>] printk+0x1b/0x1d
         [<c01003f2>] init+0x80/0x24e
         [<c01049cf>] kernel_thread_helper+0x7/0x10
         =======================
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      Acked-by: default avatarJeff Garzik <jeff@garzik.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      b57bd066
    • Ingo Molnar's avatar
      [PATCH] lockdep: fix seqlock_init() · 99a3eb38
      Ingo Molnar authored
      seqlock_init() needs to use spin_lock_init() for dynamic locks, so that
      lockdep is notified about the presence of a new lock.
      
      (this is a fallout of the recent networking merge, which started using
      the so-far unused seqlock_init() API.)
      
      This fix solves the following lockdep-internal warning on current -git:
      
       INFO: trying to register non-static key.
       the code is fine but needs lockdep annotation.
       turning off the locking correctness validator.
           __lock_acquire+0x10c/0x9f9
           lock_acquire+0x56/0x72
           _spin_lock+0x35/0x42
           neigh_destroy+0x9d/0x12e
           neigh_periodic_timer+0x10a/0x15c
           run_timer_softirq+0x126/0x18e
           __do_softirq+0x6b/0xe6
           do_softirq+0x64/0xd2
           ksoftirqd+0x82/0x138
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      99a3eb38
    • Linus Torvalds's avatar
      Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb · d907dd2e
      Linus Torvalds authored
      * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
        V4L/DVB (4954): Fix: On ia64, i2c adap->inb/adap->outb are wrongly evaluated
      d907dd2e
    • Linus Torvalds's avatar
    • Mauro Carvalho Chehab's avatar
      V4L/DVB (4954): Fix: On ia64, i2c adap->inb/adap->outb are wrongly evaluated · 2a7e9a26
      Mauro Carvalho Chehab authored
      i2c defines two callbacks (inb/outb). On ia64, since it defines also two macros
      with those names, it causes the following errors:
      drivers/media/video/usbvision/usbvision-i2c.c:64:39: macro "outb" passed 4 arguments, but takes just 2
      drivers/media/video/usbvision/usbvision-i2c.c: In function `try_write_address':
      drivers/media/video/usbvision/usbvision-i2c.c:64: warning: assignment makes integer from pointer without a cast
      drivers/media/video/usbvision/usbvision-i2c.c:89:38: macro "inb" passed 4 arguments, but takes just 1
      drivers/media/video/usbvision/usbvision-i2c.c: In function `try_read_address':
      drivers/media/video/usbvision/usbvision-i2c.c:89: warning: assignment makes integer from pointer without a cast
      drivers/media/video/usbvision/usbvision-i2c.c:85: warning: unused variable `buf'
      drivers/media/video/usbvision/usbvision-i2c.c:173:53: macro "inb" passed 4 arguments, but takes just 1
      drivers/media/video/usbvision/usbvision-i2c.c: In function `usb_xfer':
      drivers/media/video/usbvision/usbvision-i2c.c:173: warning: assignment makes integer from pointer without a cast
      drivers/media/video/usbvision/usbvision-i2c.c:179:54: macro "outb" passed 4 arguments, but takes just 2
      drivers/media/video/usbvision/usbvision-i2c.c:179: warning: assignment makes integer from pointer without a cast
      thanks to Andrew Morton for pointing this.
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
      2a7e9a26
    • FUJITA Tomonori's avatar
      [PATCH] remove unnecessary blk_queue_bounce in SG_IO · 33530261
      FUJITA Tomonori authored
      When I converted the original patch, I left unnecessary blk_queue_bounce in
      SG_IO.
      Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
      Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
      Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
      33530261
    • FUJITA Tomonori's avatar
      [PATCH] fix SG_IO bio leak · 77d172ce
      FUJITA Tomonori authored
      This patch fixes bio leaks in SG_IO. rq->bio can be changed after io
      completion, so we need to reset rq->bio before calling blk_rq_unmap_user()
      
      http://marc.theaimsgroup.com/?l=linux-kernel&m=116570666807983&w=2Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
      Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
      77d172ce
    • Boaz Harrosh's avatar
      [PATCH] remove blk_queue_activity_fn · 2b02a179
      Boaz Harrosh authored
      While working on bidi support at struct request level
      I have found that blk_queue_activity_fn is actually never used.
      The only user is in ide-probe.c with this code:
      
      	/* enable led activity for disk drives only */
      	if (drive->media == ide_disk && hwif->led_act)
      		blk_queue_activity_fn(q, hwif->led_act, drive);
      
      And led_act is never initialized anywhere.
      (Looking back at older kernels it was used in the PPC arch, but was removed around 2.6.18)
      Unless it is all for future use off course.
      (this patch is against linux-2.6-block.git as off 2006/12/4)
      Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
      Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
      2b02a179
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 4259cb25
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (32 commits)
        [NETPOLL]: Fix local_bh_enable() warning.
        [IPVS]: Make ip_vs_sync.c <= 80col wide.
        [IPVS]: Use msleep_interruptable() instead of ssleep() aka msleep()
        [HAMRADIO]: Fix baycom_epp.c compile failure.
        [DCCP]: Whitespace cleanups
        [DCCP] ccid3: Fixup some type conversions related to rtts
        [DCCP] ccid3: BUG-FIX - conversion errors
        [DCCP] ccid3: Reorder packet history source file
        [DCCP] ccid3: Reorder packet history header file
        [DCCP] ccid3: Make debug output consistent
        [DCCP] ccid3: Perform history operations only after packet has been sent
        [DCCP] ccid3: TX history - remove unused field
        [DCCP] ccid3: Shift window counter computation
        [DCCP] ccid3: Sanity-check RTT samples
        [DCCP] ccid3: Initialise RTT values
        [DCCP] ccid: Deprecate ccid_hc_tx_insert_options
        [DCCP]: Warn when discarding packet due to internal errors
        [DCCP]: Only deliver to the CCID rx side in charge
        [DCCP]: Simplify TFRC calculation
        [DCCP]: Debug timeval operations
        ...
      4259cb25
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32 · cd39301a
      Linus Torvalds authored
      * 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32:
        [AVR32] Add missing #include <linux/param.h> to delay.c
        [AVR32] Pass dev parameter to dma_cache_sync()
        [AVR32] Implement intc_get_pending()
        [AVR32] Don't include <asm/delay.h>
        [AVR32] Put the chip in "stop" mode when halting the system
        [AVR32] Set flow handler for external interrupts
        [AVR32] Remove unused file
        [AVR32] Remove mii_phy_addr and eth_addr from eth_platform_data
        [AVR32] Move ethernet tag parsing to board-specific code
        [AVR32] Add macb1 platform_device
        [AVR32] Portmux API update
      cd39301a
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 13d7d84e
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (36 commits)
        [POWERPC] Generic BUG for powerpc
        [PPC] Fix compile failure do to introduction of PHY_POLL
        [POWERPC] Only export __mtdcr/__mfdcr if CONFIG_PPC_DCR is set
        [POWERPC] Remove old dcr.S
        [POWERPC] Fix SPU coredump code for max_fdset removal
        [POWERPC] Fix irq routing on some 32-bit PowerMacs
        [POWERPC] ps3: Add vuart support
        [POWERPC] Support ibm,dynamic-reconfiguration-memory nodes
        [POWERPC] dont allow pSeries_probe to succeed without initialising MMU
        [POWERPC] micro optimise pSeries_probe
        [POWERPC] Add SPURR SPR to sysfs
        [POWERPC] Add DSCR SPR to sysfs
        [POWERPC] Fix 440SPe CPU table entry
        [POWERPC] Add support for FP emulation for the e300c2 core
        [POWERPC] of_device_register: propagate device_create_file return code
        [POWERPC] Fix mmap of PCI resource with hack for X
        [POWERPC] iSeries: head_64.o needs to depend on lparmap.s
        [POWERPC] cbe_thermal: Fix initialization of sysfs attribute_group
        [POWERPC] Remove QE header files from lite5200.c
        [POWERPC] of_platform_make_bus_id(): make `magic' int
        ...
      13d7d84e
    • Franck Bui-Huu's avatar
      [MIPS] paging_init(): use highend_pfn/highstart_pfn · cbb8fc07
      Franck Bui-Huu authored
      This patch makes paging_init() use highend_pfn/highstart_pfn globals.
      
      It removes the need of 'high' local which was needed only by HIGHMEM config.
      
      More important perhaps, it fixes a bug when HIGHMEM is set but there's
      actually no physical highmem (highend_pfn = 0)
      Signed-off-by: default avatarFranck Bui-Huu <fbuihuu@gmail.com>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      cbb8fc07
    • Ralf Baechle's avatar
      b228f4c5
    • Ralf Baechle's avatar
      [MIPS] Discard .exit.text and .exit.data at runtime. · 2efac77e
      Ralf Baechle authored
      While the recent cset 86384d54 did improve
      things it didn't resolve all the problems.  So bite the bullet and discard
      .exit.text and .exit.data at runtime.  Which of course sucks because it
      bloats binaries with code that will never ever be used but it's the only
      thing that will work reliable as demonstrated by the function sd_major() in
      drivers/scsi/sd.c.
      
      Gcc may compile sd_major() using a jump table which it will put into
      .rodata.  If it also inlines sd_major's function body into exit_sd() which
      gcc > 3.4.x does.  If CONFIG_BLK_DEV_SD has been set to y we would like ld
      to discard exit_sd's code at link time.  However sd_major happens to
      contain a switch statement which gcc will compile using a jump table in
      .rodata on the architectures I checked.  So, when ld later discards
      .exit.text only the jump table in .rodata with its stale references to
      the discard .exit.text will be left which any no antique ld will honor
      with a link error.
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      2efac77e
    • Ralf Baechle's avatar
      [MIPS] IP27: Don't drag <asm/sn/arch.h> into topology.h. · 8b2f3550
      Ralf Baechle authored
      Another way that old SGI types were getting dragged into generic code.
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      8b2f3550
    • Ralf Baechle's avatar
      [MIPS] IP27: Move definition of nic_t to its sole user. · 2bbc5bdf
      Ralf Baechle authored
      This also fixes the duplicate definition of nic_t in the s2io driver.
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      2bbc5bdf
    • Ralf Baechle's avatar
      [MIPS] IP27: Don't include <asm/sn/arch.h>. · 2f3643ae
      Ralf Baechle authored
      Nothing <asm/sn/arch.h> defines is used.
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      2f3643ae
    • Ralf Baechle's avatar
    • Andrew Morton's avatar
      [NETPOLL]: Fix local_bh_enable() warning. · a49f99ff
      Andrew Morton authored
      During boot we get:
      
      netconsole: device eth0 not up yet, forcing it
      e1000: eth0: e1000_watchdog: NIC Link is Up 100 Mbps Full Duplex
      WARNING (!__warned) at kernel/softirq.c:137 local_bh_enable()
      
      Call Trace:
       [<ffffffff80235baf>] local_bh_enable+0x41/0xa3
       [<ffffffff8045ab8e>] netpoll_send_skb+0x116/0x144
       [<ffffffff8045b1ee>] netpoll_send_udp+0x263/0x271
       [<ffffffff803d41ec>] write_msg+0x42/0x5e
       [<ffffffff80230c9b>] __call_console_drivers+0x5f/0x70
       [<ffffffff80230d19>] _call_console_drivers+0x6d/0x71
       [<ffffffff802313f0>] release_console_sem+0x148/0x1ec
       [<ffffffff802316ce>] register_console+0x1b1/0x1ba
       [<ffffffff803d4178>] init_netconsole+0x54/0x68
       [<ffffffff802071ae>] init+0x152/0x308
       [<ffffffff804dac8b>] _spin_unlock_irq+0x14/0x30
       [<ffffffff8022c15e>] schedule_tail+0x43/0x9f
       [<ffffffff8020a758>] child_rip+0xa/0x12
      
      Herbert sayeth:
      
        Normally networking isn't invoked with interrupts turned off, but I
        suppose we don't have a choice here.  This is unique being a place where you
        can get called with BH on, off, or IRQs off.
      
        Given that this is only used for printk, the easiest solution is probably
        just to disable local IRQs instead of BH.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a49f99ff
    • Yoshinori Sato's avatar
      sh: Fixup SH-2 BUG() trap handling. · e9cfc147
      Yoshinori Sato authored
      This adds in support for the BUG() trap on SH-2.
      Signed-off-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      e9cfc147
    • Paul Mundt's avatar
      b641fe01
  3. 11 Dec, 2006 3 commits