1. 10 Feb, 2008 40 commits
    • Bartlomiej Zolnierkiewicz's avatar
    • Bartlomiej Zolnierkiewicz's avatar
      ide: fix comment in init_irq() · e1771e20
      Bartlomiej Zolnierkiewicz authored
      APUS support is gone...
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      e1771e20
    • Bartlomiej Zolnierkiewicz's avatar
      ide: ide_init_port() bugfix · 42800942
      Bartlomiej Zolnierkiewicz authored
      On Sunday 10 February 2008, Atsushi Nemoto wrote:
      > On Sun, 06 Jan 2008 18:03:10 +0100, Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> wrote:
      > > +	/* reset DMA masks only for SFF-style DMA controllers */
      > > +	if ((d->host_flags && IDE_HFLAG_NO_DMA) == 0 && hwif->dma_base == 0)
      > > +		hwif->swdma_mask = hwif->mwdma_mask = hwif->ultra_mask = 0;
      > 
      > It might be too late, but "host_flags && IDE_HFLAGS_NO_DMA" seems
      > wrong for me.
      
      Fix regression caused by commmit c413b9b9
      ("ide: add struct ide_port_info instances to legacy host drivers").
      Reported-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      42800942
    • Bartlomiej Zolnierkiewicz's avatar
      ide-disk: fix flush requests (take 2) · 395d8ef5
      Bartlomiej Zolnierkiewicz authored
      commit 813a0eb2
      Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      Date:   Fri Jan 25 22:17:10 2008 +0100
      
          ide: switch idedisk_prepare_flush() to use REQ_TYPE_ATA_TASKFILE requests
      
      ...
      
      broke flush requests.
      
      Allocating IDE command structure on the stack for flush requests is not
      a very brilliant idea:
      
      - idedisk_prepare_flush() only prepares the request and it doesn't wait
        for it to be completed
      
      - there are can be multiple flush requests queued in the queue
      
      Fix the problem (per hints from James Bottomley) by:
      - dynamically allocating ide_task_t instance using kmalloc(..., GFP_ATOMIC)
      - adding new taskfile flag (IDE_TFLAG_DYN)
      - calling kfree() in ide_end_drive_command() if IDE_TFLAG_DYN is set
        (while at it rename 'args' to 'task' and fix whitespace damage)
      
      [ This will be fixed properly before 2.6.25 but this bug is rather
        critical and the proper solution requires some more work + testing. ]
      
      Thanks to Sebastian Siewior and Christoph Hellwig for reporting the
      problem and testing patches (extra thanks to Sebastian for bisecting
      it to the guilty commmit).
      Tested-by: default avatarSebastian Siewior <ide-bug@ml.breakpoint.cc>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
      Cc: Jens Axboe <jens.axboe@oracle.com>
      Cc: Tejun Heo <htejun@gmail.com>
      Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      395d8ef5
    • Sergei Shtylyov's avatar
      ide: introduce CONFIG_BLK_DEV_IDEDMA_SFF option · 8e882ba1
      Sergei Shtylyov authored
      Introduce new option CONFIG_BLK_DEV_IDEDMA_SFF for non-PCI SFF-8038i compatible
      bus mastering IDE controllers (which there are a few known), thus fixing a hack
      made for Palmchip BK3710 controller...
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Cc: Anton Salnikov <asalnikov@ru.mvista.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      8e882ba1
    • Bartlomiej Zolnierkiewicz's avatar
      bast-ide: build fix · 7b56a937
      Bartlomiej Zolnierkiewicz authored
      On Saturday 09 February 2008, Adrian Bunk wrote:
      > Commit 9e016a71 causes the following 
      > compile error:
      > 
      > <--  snip  -->
      > 
      > ...
      >   CC      drivers/ide/arm/bast-ide.o
      > /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c: In function 'bastide_register':
      > /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c:31: error: 'hwif' redeclared as different kind of symbol
      > /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c:29: error: previous definition of 'hwif' was here
      > make[4]: *** [drivers/ide/arm/bast-ide.o] Error 1
      > 
      > <--  snip  -->
      
      Remove 'ide_hwif_t **hwif' argument from bastide_register()
      (together with write-only ifs[]).
      
      Cc: Adrian Bunk <bunk@kernel.org>
      Cc: Russell King <rmk@arm.linux.org.uk>
      Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      7b56a937
    • Bartlomiej Zolnierkiewicz's avatar
      ide-tape: remove never executed code · 31cb2120
      Bartlomiej Zolnierkiewicz authored
      rq->cmd[0] is never set to REQ_IDETAPE_READ_BUFFER so remove
      REQ_IDETAPE_READ_BUFFER handling from idetape_create_write_cmd()
      and the define itself.
      
      Then remove no longer used idetape_create_read_buffer_cmd()
      and IDETAPE_RETRIEVE_FAULTY_BLOCK define.
      
      There should be no functional changes caused by this patch.
      
      Cc: Borislav Petkov <petkovbb@gmail.com>
      Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      31cb2120
    • Adrian Bunk's avatar
      ide: fix ide/legacy/gayle.c compilation · 56efa7b0
      Adrian Bunk authored
      Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      56efa7b0
    • Borislav Petkov's avatar
    • Bartlomiej Zolnierkiewicz's avatar
      ide: remove stale version number · eba8ff94
      Bartlomiej Zolnierkiewicz authored
      On Thursday 03 January 2008, Robert Hancock wrote:
      
      [...]
      
      > How about getting rid of this stupid thing in drivers/ide/ide.c:
      > 
      > #define       REVISION        "Revision: 7.00alpha2"
      > 
      > which is used in:
      > 
      > printk(KERN_INFO "Uniform Multi-Platform E-IDE driver " REVISION "\n");
      > 
      > It's been 7.00alpha2 for god knows how long, so clearly this version 
      > number is not useful..
      
      Cc: Robert Hancock <hancockr@shaw.ca>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      eba8ff94
    • Bartlomiej Zolnierkiewicz's avatar
      pdc202xx_old: always enable burst mode · cfa2771b
      Bartlomiej Zolnierkiewicz authored
      Alan has noticed that distros always enabled burst mode
      (+ datasheet confirms that it is the right thing to do).
      
      Thus fix pdc202xx_old host driver to do it unconditionally
      and remove no longer needed CONFIG_PDC202XX_BURST option.
      
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      cfa2771b
    • Bartlomiej Zolnierkiewicz's avatar
      palm_bk3710: use struct ide_port_info · c79b60dd
      Bartlomiej Zolnierkiewicz authored
      * Factor out cable detection to palm_bk3710_cable_detect().
      
      * Add palm_bk3710_init_hwif() (->init_hwif method implementation).
      
      * Remove needless ->quirkproc initialization.
      
      * Add missing ->pio_mask initialization.
      
      * Use ATA_* defines for setting ->{ultra,mwdma}_mask.
      
      * Add 'struct ide_port_info palm_bk3710_port_info' and pass it to
        ide_device_add().  Then remove open-coded 'hwif' initialization.
      
      Cc: Anton Salnikov <asalnikov@ru.mvista.com>
      Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      c79b60dd
    • Bartlomiej Zolnierkiewicz's avatar
      palm_bk3710: port initialization/probing bugfix · c92a7f1d
      Bartlomiej Zolnierkiewicz authored
      Probe port _after_ it is fully initialized.
      
      Cc: Anton Salnikov <asalnikov@ru.mvista.com>
      Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      c92a7f1d
    • Bartlomiej Zolnierkiewicz's avatar
      palm_bk3710: fix ide_unregister() usage · d4452be7
      Bartlomiej Zolnierkiewicz authored
      Don't set 'restore' flag for ide_unregister() when initializing new
      interface.
      
      [ identical change as done to bast-ide/ide-cs/delkin_cb host drivers
        by commit 909f4369 ]
      
      Cc: Anton Salnikov <asalnikov@ru.mvista.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      d4452be7
    • Bartlomiej Zolnierkiewicz's avatar
      palm_bk3710: ide_register_hw() -> ide_device_add() · 7824bc6b
      Bartlomiej Zolnierkiewicz authored
      * Convert palm_bk3710 host driver to use ide_device_add() instead of
        ide_register_hw() (while at it drop doing "ide_unregister()" loop which
        tries to unregister _all_ IDE interfaces if useable ide_hwifs[] slot
        cannot be find).
      
        [ identical change as done to bast-ide/ide-cs/delkin_cb host drivers
          by commit 9e016a71 ]
      
      * Rename 'ide_ctlr_info' to 'hw' and 'index' to 'i' while at it.
      
      Cc: Anton Salnikov <asalnikov@ru.mvista.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      7824bc6b
    • Sergei Shtylyov's avatar
      ide: insert BUG_ON() into __ide_set_handler() (take 2) · d30a426d
      Sergei Shtylyov authored
      Replace the check for hwgroup->handler and printk(KERN_CRIT, ...) at the start
      of __ide_set_handler() with mere BUG_ON() while removing such from the caller,
      ide_execute_command(). Fix up the code formatting, while at it...
      Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      d30a426d
    • Benjamin Herrenschmidt's avatar
      cs5520: remove stale comment · cb777922
      Benjamin Herrenschmidt authored
      Remove stale comment from the cs5520 IDE driver.
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      cb777922
    • Kiyoshi Ueda's avatar
      ide: another possible ide panic fix for blk-end-request · 3b0e044d
      Kiyoshi Ueda authored
      I have reviewed all blk-end-request patches again to confirm whether
      there are any similar problems with the last week's ide-cd panic:
          http://lkml.org/lkml/2008/1/29/140
      
      And I found a possible similar bug in ide-io change:
      ide_end_drive_cmd() could be called for blk_pc_request() which could
      have bios.  To complete such requests correctly, we need to pass
      the actual size of the request.
      Otherwise, __blk_end_request() returns 1 because the request still has
      bios, and the system will BUG() unnecessarily.
      
      The following patch fixes the bug and should be applied on top of
      Linus' git.
      Signed-off-by: default avatarKiyoshi Ueda <k-ueda@ct.jp.nec.com>
      Signed-off-by: default avatarJun'ichi Nomura <j-nomura@ce.jp.nec.com>
      Cc: Borislav Petkov <petkovbb@googlemail.com>
      Cc: Jens Axboe <jens.axboe@oracle.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      3b0e044d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · 0eccf60b
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (30 commits)
        [ARM] constify function pointer tables
        [ARM] 4823/1: AT91 section fix
        [ARM] 4824/1: pxa: clear RDH bit after any reset
        [ARM] pxa: remove debugging PM: printk
        ARM: OMAP1: Misc clean-up
        ARM: OMAP1: Update defconfigs for omap1
        ARM: OMAP1: Palm Tungsten E board clean-up
        ARM: OMAP1: Use I2C bus registration helper for omap1
        ARM: OMAP1: Remove omap_sram_idle()
        ARM: OMAP1: PM fixes for OMAP1
        ARM: OMAP1: Use MMC multislot structures for Siemens SX1 board
        ARM: OMAP1: Make omap1 use MMC multislot structures
        ARM: OMAP1: Change the comments to C style
        ARM: OMAP1: Make omap1 boards to use omap_nand_platform_data
        ARM: OMAP: Add helper module for board specific I2C bus registration
        ARM: OMAP: Add dmtimer support for OMAP3
        ARM: OMAP: Pre-3430 clean-up for dmtimer.c
        ARM: OMAP: Add DMA support for chaining and 3430
        ARM: OMAP: Add 24xx GPIO debounce support
        ARM: OMAP: Get rid of unnecessary ifdefs in GPIO code
        ...
      0eccf60b
    • Matthew Wilcox's avatar
      Change pci_raw_ops to pci_raw_read/write · b6ce068a
      Matthew Wilcox authored
      We want to allow different implementations of pci_raw_ops for standard
      and extended config space on x86.  Rather than clutter generic code with
      knowledge of this, we make pci_raw_ops private to x86 and use it to
      implement the new raw interface -- raw_pci_read() and raw_pci_write().
      Signed-off-by: default avatarMatthew Wilcox <willy@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b6ce068a
    • Ivan Kokshaysky's avatar
      PCI x86: always use conf1 to access config space below 256 bytes · a0ca9909
      Ivan Kokshaysky authored
      Thanks to Loic Prylli <loic@myri.com>, who originally proposed
      this idea.
      
      Always using legacy configuration mechanism for the legacy config space
      and extended mechanism (mmconf) for the extended config space is
      a simple and very logical approach. It's supposed to resolve all
      known mmconf problems. It still allows per-device quirks (tweaking
      dev->cfg_size). It also allows to get rid of mmconf fallback code.
      Signed-off-by: default avatarIvan Kokshaysky <ink@jurassic.park.msu.ru>
      Signed-off-by: default avatarMatthew Wilcox <willy@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a0ca9909
    • Linus Torvalds's avatar
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt · 58a14ee9
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
        hrtimer: don't modify restart_block->fn in restart functions
        hrtimer: fix *rmtp/restarts handling in compat_sys_nanosleep()
        hrtimer: fix *rmtp handling in hrtimer_nanosleep()
        ntp: correct inconsistent interval/tick_length usage
      58a14ee9
    • Bastian Blank's avatar
      splice: fix user pointer access in get_iovec_page_array() · 712a30e6
      Bastian Blank authored
      Commit 8811930d ("splice: missing user
      pointer access verification") added the proper access_ok() calls to
      copy_from_user_mmap_sem() which ensures we can copy the struct iovecs
      from userspace to the kernel.
      
      But we also must check whether we can access the actual memory region
      pointed to by the struct iovec to fix the access checks properly.
      Signed-off-by: default avatarBastian Blank <waldi@debian.org>
      Acked-by: default avatarOliver Pinter <oliver.pntr@gmail.com>
      Cc: Jens Axboe <jens.axboe@oracle.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      712a30e6
    • David S. Miller's avatar
      [PKT_SCHED] ematch: Fix build warning. · 30ddb159
      David S. Miller authored
      Commit 954415e3 ("[PKT_SCHED] ematch:
      tcf_em_destroy robustness") removed a cast on em->data when
      passing it to kfree(), but em->data is an integer type that can
      hold pointers as well as other values so the cast is necessary.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      30ddb159
    • Oleg Nesterov's avatar
      hrtimer: don't modify restart_block->fn in restart functions · c289b074
      Oleg Nesterov authored
      hrtimer_nanosleep_restart() clears/restores restart_block->fn. This is
      pointless and complicates its usage. Note that if sys_restart_syscall()
      doesn't actually happen, we have a bogus "pending" restart->fn anyway,
      this is harmless.
      Signed-off-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
      Cc: Alexey Dobriyan <adobriyan@sw.ru>
      Cc: Pavel Emelyanov <xemul@sw.ru>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Toyo Abe <toyoa@mvista.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      c289b074
    • Oleg Nesterov's avatar
      hrtimer: fix *rmtp/restarts handling in compat_sys_nanosleep() · 41652937
      Oleg Nesterov authored
      Spotted by Pavel Emelyanov and Alexey Dobriyan.
      
      compat_sys_nanosleep() implicitly uses hrtimer_nanosleep_restart(), this can't
      work. Make a suitable compat_nanosleep_restart() helper.
      
      Introduced by commit c70878b4
      hrtimer: hook compat_sys_nanosleep up to high res timer code
      
      Also, set ->addr_limit = KERNEL_DS before doing hrtimer_nanosleep(), this func
      was changed by the previous patch and now takes the "__user *" parameter.
      
      Thanks to Ingo Molnar for fixing the bug in this patch.
      Signed-off-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Alexey Dobriyan <adobriyan@sw.ru>
      Cc: Pavel Emelyanov <xemul@sw.ru>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Toyo Abe <toyoa@mvista.com>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      41652937
    • Oleg Nesterov's avatar
      hrtimer: fix *rmtp handling in hrtimer_nanosleep() · 080344b9
      Oleg Nesterov authored
      Spotted by Pavel Emelyanov and Alexey Dobriyan.
      
      hrtimer_nanosleep() sets restart_block->arg1 = rmtp, but this rmtp points to
      the local variable which lives in the caller's stack frame. This means that
      if sys_restart_syscall() actually happens and it is interrupted as well, we
      don't update the user-space variable, but write into the already dead stack
      frame.
      
      Introduced by commit 04c22714
      hrtimer: Rework hrtimer_nanosleep to make sys_compat_nanosleep easier
      
      Change the callers to pass "__user *rmtp" to hrtimer_nanosleep(), and change
      hrtimer_nanosleep() to use copy_to_user() to actually update *rmtp.
      
      Small problem remains. man 2 nanosleep states that *rtmp should be written if
      nanosleep() was interrupted (it says nothing whether it is OK to update *rmtp
      if nanosleep returns 0), but (with or without this patch) we can dirty *rem
      even if nanosleep() returns 0.
      
      NOTE: this patch doesn't change compat_sys_nanosleep(), because it has other
      bugs. Fixed by the next patch.
      Signed-off-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
      Cc: Alexey Dobriyan <adobriyan@sw.ru>
      Cc: Michael Kerrisk <mtk.manpages@googlemail.com>
      Cc: Pavel Emelyanov <xemul@sw.ru>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Toyo Abe <toyoa@mvista.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      
       include/linux/hrtimer.h |    2 -
       kernel/hrtimer.c        |   51 +++++++++++++++++++++++++-----------------------
       kernel/posix-timers.c   |   14 +------------
       3 files changed, 30 insertions(+), 37 deletions(-)
      080344b9
    • john stultz's avatar
      ntp: correct inconsistent interval/tick_length usage · e13a2e61
      john stultz authored
      clocksource initialization and error accumulation.  This corrects a 280ppm
      drift seen on some systems using acpi_pm, and affects other clocksources as
      well (likely to a lesser degree).
      Signed-off-by: default avatarJohn Stultz <johnstul@us.ibm.com>
      Cc: Roman Zippel <zippel@linux-m68k.org>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      e13a2e61
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 25f66630
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (28 commits)
        [NET_SCHED] sch_htb: htb_requeue fix
        [IPV6]: Replace using the magic constant "1024" with IP6_RT_PRIO_USER for fc_metric.
        starfire: secton fix
        via-velocity: section fix
        natsemi: section fix
        typhoon: section fix
        isdn: fix section mismatch warning for ISACVer
        isdn: fix section mismatch warnings from hisax_cs_setup_card
        isdn: fix section mismatch warnings in isac.c and isar.c
        isdn: fix section mismatch warning in hfc_sx.c
        [PKT_SCHED] ematch: tcf_em_destroy robustness
        [PKT_SCHED]: deinline functions in meta match
        [SCTP]: Convert sctp_dbg_objcnt to seq files.
        [SCTP]: Use snmp_fold_field instead of a homebrew analogue.
        [IGMP]: Optimize kfree_skb in igmp_rcv.
        [KEY]: Convert net/pfkey to use seq files.
        [KEY]: Clean up proc files creation a bit.
        pppol2tp: fix printk warnings
        bnx2: section fix
        bnx2x: section fix
        ...
      25f66630
    • Jarek Poplawski's avatar
      [NET_SCHED] sch_htb: htb_requeue fix · 21347456
      Jarek Poplawski authored
      htb_requeue() enqueues skbs for which htb_classify() returns NULL.
      This is wrong because such skbs could be handled by NET_CLS_ACT code,
      and the decision could be different than earlier in htb_enqueue().
      So htb_requeue() is changed to work and look more like htb_enqueue().
      Signed-off-by: default avatarJarek Poplawski <jarkao2@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      21347456
    • Rami Rosen's avatar
      [IPV6]: Replace using the magic constant "1024" with IP6_RT_PRIO_USER for fc_metric. · 238fc7ea
      Rami Rosen authored
      This patch replaces the explicit usage of the magic constant "1024"
      with IP6_RT_PRIO_USER in the IPV6 tree.
      Signed-off-by: default avatarRami Rosen <ramirose@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      238fc7ea
    • Andrew Morton's avatar
      starfire: secton fix · da219b7c
      Andrew Morton authored
      gcc-3.4.4 on powerpc:
      
      drivers/net/starfire.c:219: error: version causes a section type conflict
      
      Cc: Jeff Garzik <jeff@garzik.org>
      Cc: Sam Ravnborg <sam@ravnborg.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      da219b7c
    • Andrew Morton's avatar
      via-velocity: section fix · 4f14b92f
      Andrew Morton authored
      From: Andrew Morton <akpm@linux-foundation.org>
      
      gcc-3.4.4 on powerpc:
      
      drivers/net/via-velocity.c:443: error: chip_info_table causes a section type conflict
      
      on this one I had to remove the __devinitdata too.  Don't know why.
      
      Cc: Jeff Garzik <jeff@garzik.org>
      Cc: Sam Ravnborg <sam@ravnborg.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4f14b92f
    • Andrew Morton's avatar
      natsemi: section fix · aa738adf
      Andrew Morton authored
      gcc-3.4.4 on powerpc:
      
      drivers/net/natsemi.c:245: error: natsemi_pci_info causes a section type conflict
      
      Cc: Jeff Garzik <jeff@garzik.org>
      Cc: Sam Ravnborg <sam@ravnborg.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      aa738adf
    • Andrew Morton's avatar
      typhoon: section fix · 952b3494
      Andrew Morton authored
      gcc-3.4.4 on powerpc:
      
      drivers/net/typhoon.c:137: error: version causes a section type conflict
      
      Cc: Jeff Garzik <jeff@garzik.org>
      Cc: Sam Ravnborg <sam@ravnborg.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      952b3494
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 · 0b6ca82a
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (32 commits)
        x86: cpa, strict range check in try_preserve_large_page()
        x86: cpa, enable CONFIG_DEBUG_PAGEALLOC on 64-bit
        x86: cpa, use page pool
        x86: introduce page pool in cpa
        x86: DEBUG_PAGEALLOC: enable after mem_init()
        brk: help text typo fix
        lguest: accept guest _PAGE_PWT page table entries
        x86 PM: update stale comments
        x86 PM: consolidate suspend and hibernation code
        x86 PM: rename 32-bit files in arch/x86/power
        x86 PM: move 64-bit hibernation files to arch/x86/power
        x86: trivial printk optimizations
        x86: fix early_ioremap pagetable ops
        x86: construct 32-bit boot time page tables in native format.
        x86, core: remove CONFIG_FORCED_INLINING
        x86: avoid unused variable warning in mm/init_64.c
        x86: fixup more paravirt fallout
        brk: document randomize_va_space and CONFIG_COMPAT_BRK (was Re:
        x86: fix sparse warnings in acpi/bus.c
        x86: fix sparse warning in topology.c
        ...
      0b6ca82a
    • Sam Ravnborg's avatar
      isdn: fix section mismatch warning for ISACVer · f4e64333
      Sam Ravnborg authored
      Fix following warnings:
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x19723): Section mismatch in reference from the function ISACVersion() to the variable .devinit.data:ISACVer
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x2005b): Section mismatch in reference from the function setup_avm_a1_pcmcia() to the function .devinit.text:setup_isac()
      
      ISACVer were only used from function annotated __devinit
      so add same annotation to ISACVer.
      One af the fererencing functions missed __devinit so add it
      and kill an additional warning.
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Acked-by: default avatarKarsten Keil <kkeil@suse.de>
      Cc: Jeff Garzik <jgarzik@pobox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f4e64333
    • Sam Ravnborg's avatar
      isdn: fix section mismatch warnings from hisax_cs_setup_card · 2fddb6e2
      Sam Ravnborg authored
      Fix the following warnings:
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x722): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_teles3()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x72c): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_s0box()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x736): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_telespci()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x747): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_avm_pcipnp()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x74e): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_elsa()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x755): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_diva()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x75c): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_sedlbauer()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x763): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_netjet_s()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x76a): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_hfcpci()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x771): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_hfcsx()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x778): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_niccy()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x77f): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_bkm_a4t()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x786): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_sct_quadro()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x78d): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_gazel()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x794): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_w6692()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x79b): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_netjet_u()
      WARNING: drivers/isdn/hisax/built-in.o(.text+0x7a2): Section mismatch in reference from the function hisax_cs_setup_card() to the function .devinit.text:setup_enternow_pci()
      
      checkcard() are the only user of hisax_cs_setup_card().
      And checkcard is only used during init or when hot plugging
      ISDN devices. So annotate hisax_cs_setup_card() with __devinit.
      checkcard() is used by exported functions so it cannot be
      annotated __devinit. Annotate it with __ref so modpost
      ignore references to _devinit section.
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Acked-by: default avatarKarsten Keil <kkeil@suse.de>
      Cc: Jeff Garzik <jgarzik@pobox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2fddb6e2
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · bfc1de0c
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: (24 commits)
        [SPARC]: Add solaris/sunos binary support to feature removal schedule.
        [SPARC]: Merge asm-sparc{,64}/a.out.h
        [SPARC]: Merge asm-sparc{,64}/fb.h
        [SPARC]: Merge asm-sparc{,64}/errno.h
        [SPARC]: Merge asm-sparc{,64}/emergency-restart.h
        [SPARC]: Merge asm-sparc{,64}/div64.h
        [SPARC]: Merge asm-sparc{,64}/device.h
        [SPARC]: Merge asm-sparc{,64}/current.h
        [SPARC]: Merge asm-sparc{,64}/cputime.h
        [SPARC]: Merge asm-sparc{,64}/cache.h
        [SPARC]: Merge asm-sparc{,64}/byteorder.h
        [SPARC]: Merge asm-sparc{,64}/bugs.h
        [SPARC]: Merge asm-sparc{,64}/bug.h
        [SPARC]: Kill BSD errno translation table and header files.
        [SPARC]: Merge asm-sparc{,64}/bpp.h
        [SPARC]: Merge include/asm-sparc{,64}/auxvec.h
        [SPARC]: Merge include/asm-sparc{,64}/of_device.h
        [SPARC]: Merge include/asm-sparc{,64}/prom.h
        [SPARC]: Remove of_platform_device_create
        [SPARC64]: Add kretprobe support.
        ...
      bfc1de0c