1. 15 2月, 2008 34 次提交
  2. 14 2月, 2008 6 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 · e760e716
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
        [SCSI] gdth: update deprecated pci_find_device
        [SCSI] gdth: scan for scsi devices
        [SCSI] sym53c416: fix module parameters
        [SCSI] lpfc 8.2.5 : Update lpfc driver version to 8.2.5
        [SCSI] lpfc 8.2.5 : Fix buffer leaks
        [SCSI] lpfc 8.2.5 : Miscellaneous discovery Fixes
        [SCSI] lpfc 8.2.5 : Add MSI-X single message support
        [SCSI] lpfc 8.2.5 : Miscellaneous Fixes
        [SCSI] lpfc 8.2.5 : Correct ndlp referencing issues
        [SCSI] update SG_ALL to avoid causing chaining
        [SCSI] aic94xx: fix ABORT_TASK define conflict
        [SCSI] fas216: Use scsi_eh API for REQUEST_SENSE invocation
        [SCSI] ses: fix memory leaks
        [SCSI] aacraid: informational sysfs value corrections
        [SCSI] mpt fusion: Request I/O resources only when required
        [SCSI] aacraid: ignore adapter reset check polarity
        [SCSI] aacraid: add optional MSI support
        [SCSI] mpt fusion: Avoid racing when mptsas and mptcl module are loaded in parallel
        [SCSI] MegaRAID driver management char device moved to misc
        [SCSI] advansys: fix overrun_buf aligned bug
      e760e716
    • M
      Linux Kernel Markers: create modpost file · b2e3e658
      Mathieu Desnoyers 提交于
      This adds some new magic in the MODPOST phase for CONFIG_MARKERS.  Analogous
      to the Module.symvers file, the build will now write a Module.markers file
      when CONFIG_MARKERS=y is set.  This file lists the name, defining module, and
      format string of each marker, separated by \t characters.  This simple text
      file can be used by offline build procedures for instrumentation code,
      analogous to how System.map and Module.symvers can be useful to have for
      kernels other than the one you are running right now.
      
      The strings are made easy to extract by having the __trace_mark macro define
      the name and format together in a single array called __mstrtab_* in the
      __markers_strings section.  This is straightforward and reliable as long as
      the marker structs are always defined by this macro.  It is an unreasonable
      amount of hairy work to extract the string pointers from the __markers section
      structs, which entails handling a relocation type for every machine under the
      sun.
      
      Mathieu :
      - Ran through checkpatch.pl
      Signed-off-by: NRoland McGrath <roland@redhat.com>
      Signed-off-by: NMathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
      Cc: David Smith <dsmith@redhat.com>
      Cc: Sam Ravnborg <sam@ravnborg.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b2e3e658
    • M
      Linux Kernel Markers: support multiple probes · fb40bd78
      Mathieu Desnoyers 提交于
      RCU style multiple probes support for the Linux Kernel Markers.  Common case
      (one probe) is still fast and does not require dynamic allocation or a
      supplementary pointer dereference on the fast path.
      
      - Move preempt disable from the marker site to the callback.
      
      Since we now have an internal callback, move the preempt disable/enable to the
      callback instead of the marker site.
      
      Since the callback change is done asynchronously (passing from a handler that
      supports arguments to a handler that does not setup the arguments is no
      arguments are passed), we can safely update it even if it is outside the
      preempt disable section.
      
      - Move probe arm to probe connection. Now, a connected probe is automatically
        armed.
      
      Remove MARK_MAX_FORMAT_LEN, unused.
      
      This patch modifies the Linux Kernel Markers API : it removes the probe
      "arm/disarm" and changes the probe function prototype : it now expects a
      va_list * instead of a "...".
      
      If we want to have more than one probe connected to a marker at a given
      time (LTTng, or blktrace, ssytemtap) then we need this patch. Without it,
      connecting a second probe handler to a marker will fail.
      
      It allow us, for instance, to do interesting combinations :
      
      Do standard tracing with LTTng and, eventually, to compute statistics
      with SystemTAP, or to have a special trigger on an event that would call
      a systemtap script which would stop flight recorder tracing.
      Signed-off-by: NMathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: Mike Mason <mmlnx@us.ibm.com>
      Cc: Dipankar Sarma <dipankar@in.ibm.com>
      Cc: David Smith <dsmith@redhat.com>
      Cc: "Paul E. McKenney" <paulmck@us.ibm.com>
      Cc: "Frank Ch. Eigler" <fche@redhat.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      fb40bd78
    • P
      pcmcia: ipwireless depends on NETDEVICES · 9170d2f6
      Paul Mundt 提交于
      ipwireless (added by 099dc4fb) is clearly
      a net device:
      
      drivers/built-in.o: In function `ipwireless_ppp_start_xmit':
      /home/pmundt/devel/git/sh-2.6.25/drivers/char/pcmcia/ipwireless/network.c:165: undefined reference to `skb_under_panic'
      /home/pmundt/devel/git/sh-2.6.25/drivers/char/pcmcia/ipwireless/network.c:165: undefined reference to `kfree_skb'
      drivers/built-in.o: In function `ipwireless_network_packet_received':
      /home/pmundt/devel/git/sh-2.6.25/drivers/char/pcmcia/ipwireless/network.c:377: undefined reference to `__alloc_skb'
      /home/pmundt/devel/git/sh-2.6.25/drivers/char/pcmcia/ipwireless/network.c:377: undefined reference to `skb_over_panic'
      drivers/built-in.o: In function `ppp_shutdown_interface':
      /home/pmundt/devel/git/sh-2.6.25/drivers/net/ppp_generic.c:2517: undefined reference to `unregister_netdev'
      /home/pmundt/devel/git/sh-2.6.25/drivers/net/ppp_generic.c:2517: undefined reference to `free_netdev'
      [ ... and many more ... ]
      
      select strikes again. ipwireless selects PPP which in turn tries to select
      SLHC, both of which are technically "protected" by an if NETDEVICES
      in drivers/net/Kconfig. This leads to .config hilarity, with net suddenly
      ending up in the SCSI menu:
      
      	#
      	# SCSI device support
      	#
      	# CONFIG_SCSI_DMA is not set
      	# CONFIG_SCSI_NETLINK is not set
      	CONFIG_PPP=y
      	# CONFIG_PHONE is not set
      
      Curiously the SLHC select from PPP doesn't seem to happen, as there's no
      CONFIG_SLHC=y (only CONFIG_PPP=y gets set) -- Kconfig bug? Caught with a
      randconfig.
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      Acked-by: NJiri Kosina <jkosina@suse.cz>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      9170d2f6
    • A
      Smack: check for 'struct socket' with NULL sk · 2e1d146a
      Ahmed S. Darwish 提交于
      There's a small problem with smack and NFS. A similar report was also
      sent here: http://lkml.org/lkml/2007/10/27/85
      
      I've also added similar checks in inode_{get/set}security().  Cheating from
      SELinux post_create_socket(), it does the same.
      
      [akpm@linux-foundation.org: remove uneeded BUG_ON()]
      Signed-off-by: NAhmed S. Darwish <darwish.07@gmail.com>
      Acked-by: NCasey Schaufler <casey@schuafler-ca.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      2e1d146a
    • M
      udf: fix udf_add_free_space · cba44359
      Marcin Slusarz 提交于
      In commit 742ba02a (udf: create common
      function for changing free space counter) by accident I reversed safety
      condition which lead to null pointer dereference in case of media error and
      wrong counting of free space in normal situation
      Signed-off-by: NMarcin Slusarz <marcin.slusarz@gmail.com>
      Cc: Jan Kara <jack@suse.cz>
      Acked-by: NCyrill Gorcunov <gorcunov@gmail.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      cba44359