Print this page
9042 multiples of tty streams modules cause weirdness
Reviewed by: Randy Fishel <randyf@sibernet.com>
Reviewed by: Carlos Neira <cneirabustos@gmail.com>
Approved by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
NEX-16818 Add fksmbcl development tool
NEX-17264 SMB client test tp_smbutil_013 fails after NEX-14666
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Matt Barden <matt.barden@nexenta.com>
and: (fix ref leaks)

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/sys/conf.h
          +++ new/usr/src/uts/common/sys/conf.h
↓ open down ↓ 16 lines elided ↑ open up ↑
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*      Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
  22   22  /*        All Rights Reserved   */
  23   23  
  24   24  /*
  25   25   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  26   26   * Use is subject to license terms.
       27 + * Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
  27   28   */
  28   29  
  29   30  #ifndef _SYS_CONF_H
  30   31  #define _SYS_CONF_H
  31   32  
  32   33  
  33   34  #include <sys/feature_tests.h>
  34   35  
  35   36  #if !defined(_XPG4_2) || defined(__EXTENSIONS__)
  36   37  #include <sys/t_lock.h>
  37   38  #endif
  38   39  
  39   40  #ifdef  __cplusplus
  40   41  extern "C" {
  41   42  #endif
  42   43  
  43   44  #define FMNAMESZ        8               /* used by struct fmodsw */
  44   45  
  45   46  #if !defined(_XPG4_2) || defined(__EXTENSIONS__)
  46   47  
  47      -#ifdef _KERNEL
       48 +#if defined(_KERNEL) || defined(_FAKE_KERNEL)
  48   49  
  49   50  /*
  50   51   * XXX  Given that drivers need to include this file,
  51   52   *      <sys/systm.h> probably shouldn't be here, as
  52   53   *      it legitimizes (aka provides prototypes for)
  53   54   *      all sorts of functions that aren't in the DKI/SunDDI
  54   55   */
       56 +#include <sys/types.h>
  55   57  #include <sys/systm.h>
       58 +
       59 +#endif  /* _KERNEL || _FAKE_KERNEL */
       60 +#ifdef  _KERNEL
       61 +
  56   62  #include <sys/devops.h>
  57   63  #include <sys/model.h>
  58      -#include <sys/types.h>
  59   64  #include <sys/buf.h>
  60   65  #include <sys/cred.h>
  61   66  #include <sys/uio.h>
  62   67  #include <sys/poll.h>
  63   68  #include <vm/as.h>
  64   69  
  65   70  typedef struct fmodsw {
  66   71          char                    f_name[FMNAMESZ + 1];
  67   72          struct streamtab        *f_str;
  68   73          int                     f_flag;
↓ open down ↓ 145 lines elided ↑ open up ↑
 214  219  #define D_DEVMAP        0x100   /* Use devmap framework to mmap device */
 215  220  
 216  221  #define D_HOTPLUG       0x4     /* Driver is hotplug capable */
 217  222  
 218  223  #define D_U64BIT        0x40000 /* Driver supports unsigned 64-bit uio offset */
 219  224  
 220  225  #define _D_DIRECT       0x80000 /* Private flag for transport modules */
 221  226  
 222  227  #define D_OPEN_RETURNS_EINTR    0x100000 /* EINTR expected from open(9E) */
 223  228  
      229 +#define _D_SINGLE_INSTANCE      0x200000 /* Module may only be pushed once */
      230 +
 224  231  #endif /* !defined(_XPG4_2) || defined(__EXTENSIONS__) */
 225  232  
 226  233  #ifdef  __cplusplus
 227  234  }
 228  235  #endif
 229  236  
 230  237  #endif  /* _SYS_CONF_H */
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX