1. 12 2月, 2008 3 次提交
    • L
      Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux · 0c0d61ca
      Linus Torvalds 提交于
      * 'for-linus' of git://linux-nfs.org/~bfields/linux:
        SUNPRC: Fix printk format warning
        nfsd: clean up svc_reserve_auth()
        NLM: don't requeue block if it was invalidated while GRANT_MSG was in flight
        NLM: don't reattempt GRANT_MSG when there is already an RPC in flight
        NLM: have server-side RPC clients default to soft RPC tasks
        NLM: set RPC_CLNT_CREATE_NOPING for NLM RPC clients
      0c0d61ca
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · eedcdefb
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
        ide: remove stale comment from ide-lib.c
        ide: fix comment in init_irq()
        ide: ide_init_port() bugfix
        ide-disk: fix flush requests (take 2)
        ide: introduce CONFIG_BLK_DEV_IDEDMA_SFF option
        bast-ide: build fix
        ide-tape: remove never executed code
        ide: fix ide/legacy/gayle.c compilation
        ide-cd: replace ntohs with generic byteorder macro be16_to_cpu
        ide: remove stale version number
        pdc202xx_old: always enable burst mode
        palm_bk3710: use struct ide_port_info
        palm_bk3710: port initialization/probing bugfix
        palm_bk3710: fix ide_unregister() usage
        palm_bk3710: ide_register_hw() -> ide_device_add()
        ide: insert BUG_ON() into __ide_set_handler() (take 2)
        cs5520: remove stale comment
        ide: another possible ide panic fix for blk-end-request
      eedcdefb
    • M
      Use proper abstractions in quirk_intel_irqbalance · 9585ca02
      Matthew Wilcox 提交于
      Since we may not have a pci_dev for the device we need to access, we can't
      use pci_read_config_word.  But raw_pci_read is an internal implementation
      detail; it's better to use the architected pci_bus_read_config_word
      interface.  Using PCI_DEVFN instead of a mysterious constant helps
      reassure everyone that we really do intend to access device 8.
      
      [ Thanks to Grant Grundler for pointing out to me that this is exactly
        what the write immediately above this is doing -- enabling device 8 to
        respond to config space cycles.
      					- Matthew
      
        Grant also says:
      
      	"Can you also add a comment which points at the Intel
      	 documentation?
      
      	 The 'Intel E7320 Memory Controller Hub (MCH) Datasheet' at
      
      	  http://download.intel.com/design/chipsets/datashts/30300702.pdf
      
      	 Page 69 documents register F4h (DEVPRES1).
      
      	 And I just doubled checked that the 0xf4 register value is
      	 restored later in the quirk (obvious when you look at the code
      	 but not from the patch"
      
        so here it is.
      					 - Linus ]
      Signed-off-by: NMatthew Wilcox <willy@linux.intel.com>
      Acked-by: NGrant Grundler <grundler@parisc-linux.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      9585ca02
  2. 11 2月, 2008 31 次提交
  3. 10 2月, 2008 6 次提交
    • D
      [PKT_SCHED] ematch: Fix build warning. · 30ddb159
      David S. Miller 提交于
      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: NDavid S. Miller <davem@davemloft.net>
      30ddb159
    • O
      hrtimer: don't modify restart_block->fn in restart functions · c289b074
      Oleg Nesterov 提交于
      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: NOleg 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: NThomas Gleixner <tglx@linutronix.de>
      c289b074
    • O
      hrtimer: fix *rmtp/restarts handling in compat_sys_nanosleep() · 41652937
      Oleg Nesterov 提交于
      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: NOleg 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: NThomas Gleixner <tglx@linutronix.de>
      41652937
    • O
      hrtimer: fix *rmtp handling in hrtimer_nanosleep() · 080344b9
      Oleg Nesterov 提交于
      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: NOleg 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: NThomas 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
    • J
      ntp: correct inconsistent interval/tick_length usage · e13a2e61
      john stultz 提交于
      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: NJohn Stultz <johnstul@us.ibm.com>
      Cc: Roman Zippel <zippel@linux-m68k.org>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      e13a2e61
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 25f66630
      Linus Torvalds 提交于
      * 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