Print this page
Adding AoE support to nza-kernel

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/os/main.c
          +++ new/usr/src/uts/common/os/main.c
↓ open down ↓ 12 lines elided ↑ open up ↑
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  
  22   22  /*
       23 + * Copyright 2012 Nexenta Systems, Inc.  All rights reserved.
  23   24   * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
  24   25   */
  25   26  
  26   27  /*      Copyright (c) 1988 AT&T */
  27   28  /*        All Rights Reserved   */
  28   29  
  29   30  /*
  30   31   * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  31   32   */
  32   33  
↓ open down ↓ 327 lines elided ↑ open up ↑
 360  361  main(void)
 361  362  {
 362  363          proc_t          *p = ttoproc(curthread);        /* &p0 */
 363  364          int             (**initptr)();
 364  365          extern void     sched();
 365  366          extern void     fsflush();
 366  367          extern int      (*init_tbl[])();
 367  368          extern int      (*mp_init_tbl[])();
 368  369          extern id_t     syscid, defaultcid;
 369  370          extern int      swaploaded;
      371 +        extern char     *aoepath_prop;
 370  372          extern int      netboot;
 371  373          extern ib_boot_prop_t *iscsiboot_prop;
 372  374          extern void     vm_init(void);
 373  375          extern void     cbe_init_pre(void);
 374  376          extern void     cbe_init(void);
 375  377          extern void     clock_tick_init_pre(void);
 376  378          extern void     clock_tick_init_post(void);
 377  379          extern void     clock_init(void);
 378  380          extern void     physio_bufs_init(void);
 379  381          extern void     pm_cfb_setup_intr(void);
↓ open down ↓ 114 lines elided ↑ open up ↑
 494  496  
 495  497          /*
 496  498           * Initialize Solaris Audit Subsystem
 497  499           */
 498  500          audit_init();
 499  501  
 500  502          /*
 501  503           * Plumb the protocol modules and drivers only if we are not
 502  504           * networked booted, in this case we already did it in rootconf().
 503  505           */
 504      -        if (netboot == 0 && iscsiboot_prop == NULL)
      506 +        if (aoepath_prop == NULL && iscsiboot_prop == NULL && !netboot)
 505  507                  (void) strplumb();
 506  508  
 507  509          gethrestime(&PTOU(curproc)->u_start);
 508  510          curthread->t_start = PTOU(curproc)->u_start.tv_sec;
 509  511          p->p_mstart = gethrtime();
 510  512  
 511  513          /*
 512  514           * Perform setup functions that can only be done after root
 513  515           * and swap have been set up.
 514  516           */
↓ open down ↓ 140 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX