1. 31 3月, 2006 1 次提交
  2. 30 3月, 2006 6 次提交
    • D
      [NET]: Deinline some larger functions from netdevice.h · 56079431
      Denis Vlasenko 提交于
      On a allyesconfig'ured kernel:
      
      Size  Uses Wasted Name and definition
      ===== ==== ====== ================================================
         95  162  12075 netif_wake_queue      include/linux/netdevice.h
        129   86   9265 dev_kfree_skb_any     include/linux/netdevice.h
        127   56   5885 netif_device_attach   include/linux/netdevice.h
         73   86   4505 dev_kfree_skb_irq     include/linux/netdevice.h
         46   60   1534 netif_device_detach   include/linux/netdevice.h
        119   16   1485 __netif_rx_schedule   include/linux/netdevice.h
        143    5    492 netif_rx_schedule     include/linux/netdevice.h
         81    7    366 netif_schedule        include/linux/netdevice.h
      
      netif_wake_queue is big because __netif_schedule is a big inline:
      
      static inline void __netif_schedule(struct net_device *dev)
      {
              if (!test_and_set_bit(__LINK_STATE_SCHED, &dev->state)) {
                      unsigned long flags;
                      struct softnet_data *sd;
      
                      local_irq_save(flags);
                      sd = &__get_cpu_var(softnet_data);
                      dev->next_sched = sd->output_queue;
                      sd->output_queue = dev;
                      raise_softirq_irqoff(NET_TX_SOFTIRQ);
                      local_irq_restore(flags);
              }
      }
      
      static inline void netif_wake_queue(struct net_device *dev)
      {
      #ifdef CONFIG_NETPOLL_TRAP
              if (netpoll_trap())
                      return;
      #endif
              if (test_and_clear_bit(__LINK_STATE_XOFF, &dev->state))
                      __netif_schedule(dev);
      }
      
      By de-inlining __netif_schedule we are saving a lot of text
      at each callsite of netif_wake_queue and netif_schedule.
      __netif_rx_schedule is also big, and it makes more sense to keep
      both of them out of line.
      
      Patch also deinlines dev_kfree_skb_any. We can deinline dev_kfree_skb_irq
      instead... oh well.
      
      netif_device_attach/detach are not hot paths, we can deinline them too.
      Signed-off-by: NDenis Vlasenko <vda@ilport.com.ua>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      56079431
    • R
      [DCCP]: Use NULL for pointers, comfort sparse. · 68907dad
      Randy Dunlap 提交于
      From: Randy Dunlap <rdunlap@xenotime.net>
      
      Use NULL instead of 0 for pointers.
      Fix these sparse warnings:
      net/dccp/feat.c:207:20: warning: Using plain integer as NULL pointer
      net/dccp/feat.c:325:21: warning: Using plain integer as NULL pointer
      net/dccp/feat.c:526:20: warning: Using plain integer as NULL pointer
      Signed-off-by: NRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      68907dad
    • P
      [DECNET]: Fix refcount · 6a57b2ee
      Patrick Caulfield 提交于
      From: Patrick Caulfield <patrick@tykepenguin.com>
      
      This patch fixes a bug in the reference counting for the default
      DECnet device.
      
      If the device is changed, then the new device had its refcount
      decremented rather than the old one!
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6a57b2ee
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · f3cab8a0
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [NETFILTER]: Rename init functions.
        [TCP]: Fix RFC2465 typo.
        [INET]: Introduce tunnel4/tunnel6
        [NET]: deinline 200+ byte inlines in sock.h
        [ECONET]: Convert away from SOCKOPS_WRAPPED
        [NET]: Fix ipx/econet/appletalk/irda ioctl crashes
        [NET]: Kill Documentation/networking/TODO
        [TG3]: Update version and reldate
        [TG3]: Skip timer code during full lock
        [TG3]: Speed up SRAM access
        [TG3]: Fix PHY loopback on 5700
        [TG3]: Fix bug in 40-bit DMA workaround code
        [TG3]: Fix probe failure due to invalid MAC address
      f3cab8a0
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 76babde1
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (67 commits)
        [PATCH] powerpc: Remove oprofile spinlock backtrace code
        [PATCH] powerpc: Add oprofile calltrace support to all powerpc cpus
        [PATCH] powerpc: Add oprofile calltrace support
        [PATCH] for_each_possible_cpu: ppc
        [PATCH] for_each_possible_cpu: powerpc
        [PATCH] lock PTE before updating it in 440/BookE page fault handler
        [PATCH] powerpc: Kill _machine and hard-coded platform numbers
        ppc: Fix compile error in arch/ppc/lib/strcase.c
        [PATCH] git-powerpc: WARN was a dumb idea
        [PATCH] powerpc: a couple of trivial compile warning fixes
        powerpc: remove OCP references
        powerpc: Make uImage default build output for MPC8540 ADS
        powerpc: move math-emu over to arch/powerpc
        powerpc: use memparse() for mem= command line parsing
        ppc: fix strncasecmp prototype
        [PATCH] powerpc: make ISA floppies work again
        [PATCH] powerpc: Fix some initcall return values
        [PATCH] powerpc: Workaround for pSeries RTAS bug
        [PATCH] spufs: fix __init/__exit annotations
        [PATCH] powerpc: add hvc backend for rtas
        ...
      76babde1
    • L
      Merge git://oss.sgi.com:8090/oss/git/xfs-2.6 · e71ac603
      Linus Torvalds 提交于
      * git://oss.sgi.com:8090/oss/git/xfs-2.6:
        [XFS] Cleanup in XFS after recent get_block_t interface tweaks.
        [XFS] Remove unused/obsoleted function: xfs_bmap_do_search_extents()
        [XFS] A change to inode chunk allocation to try allocating the new chunk
        Fixes a regression from the recent "remove ->get_blocks() support"
        [XFS] Fix compiler warning and small code inconsistencies in compat
        [XFS] We really suck at spulling.  Thanks to Chris Pascoe for fixing all
      e71ac603
  3. 29 3月, 2006 33 次提交