svn commit: r240579 - in stable/9: sys/dev/buslogic sys/dev/e1000
sys/dev/isci/scil sys/dev/isp sys/dev/mps sys/kern
sys/sparc64/sparc64 sys/vm usr.sbin/tcpdump/tcpdump
Eitan Adler
eadler at FreeBSD.org
Mon Sep 17 00:44:17 UTC 2012
Author: eadler
Date: Mon Sep 17 00:44:16 2012
New Revision: 240579
URL: http://svn.freebsd.org/changeset/base/240579
Log:
MFC r240518:
Correct double "the the"
Approved by: cperciva (implicit)
Modified:
stable/9/sys/dev/buslogic/bt.c
stable/9/sys/dev/e1000/e1000_82575.c
stable/9/sys/dev/e1000/e1000_ich8lan.c
stable/9/sys/dev/isci/scil/sati.c
stable/9/sys/dev/isci/scil/sati_callbacks.h
stable/9/sys/dev/isci/scil/sci_base_controller.h
stable/9/sys/dev/isci/scil/sci_base_domain.h
stable/9/sys/dev/isci/scil/sci_base_phy.h
stable/9/sys/dev/isci/scil/sci_base_remote_device.h
stable/9/sys/dev/isci/scil/scic_io_request.h
stable/9/sys/dev/isci/scil/scic_sds_phy.c
stable/9/sys/dev/isci/scil/scic_sds_port.h
stable/9/sys/dev/isci/scil/scic_sds_remote_node_context.h
stable/9/sys/dev/isci/scil/scic_sds_request.c
stable/9/sys/dev/isci/scil/scu_bios_definitions.h
stable/9/sys/dev/isp/isp_freebsd.c
stable/9/sys/dev/mps/mps_sas.c
stable/9/sys/kern/subr_unit.c
stable/9/sys/sparc64/sparc64/ata_machdep.c
stable/9/sys/vm/vm_pageout.c
stable/9/usr.sbin/tcpdump/tcpdump/tcpdump.1
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
stable/9/sys/dev/e1000/ (props changed)
stable/9/sys/dev/isp/ (props changed)
stable/9/tools/kerneldoc/ (props changed)
stable/9/usr.bin/lex/ (props changed)
stable/9/usr.sbin/tcpdump/ (props changed)
Modified: stable/9/sys/dev/buslogic/bt.c
==============================================================================
--- stable/9/sys/dev/buslogic/bt.c Mon Sep 17 00:44:11 2012 (r240578)
+++ stable/9/sys/dev/buslogic/bt.c Mon Sep 17 00:44:16 2012 (r240579)
@@ -1945,7 +1945,7 @@ bt_cmd(struct bt_softc *bt, bt_op_t opco
bt_outb(bt, COMMAND_REG, opcode);
/*
- * Wait for up to 1sec for each byte of the the
+ * Wait for up to 1sec for each byte of the
* parameter list sent to be sent.
*/
timeout = 10000;
Modified: stable/9/sys/dev/e1000/e1000_82575.c
==============================================================================
--- stable/9/sys/dev/e1000/e1000_82575.c Mon Sep 17 00:44:11 2012 (r240578)
+++ stable/9/sys/dev/e1000/e1000_82575.c Mon Sep 17 00:44:16 2012 (r240579)
@@ -2280,7 +2280,7 @@ out:
* e1000_reset_mdicnfg_82580 - Reset MDICNFG destination and com_mdio bits
* @hw: pointer to the HW structure
*
- * This resets the the MDICNFG.Destination and MDICNFG.Com_MDIO bits based on
+ * This resets the MDICNFG.Destination and MDICNFG.Com_MDIO bits based on
* the values found in the EEPROM. This addresses an issue in which these
* bits are not restored from EEPROM after reset.
**/
Modified: stable/9/sys/dev/e1000/e1000_ich8lan.c
==============================================================================
--- stable/9/sys/dev/e1000/e1000_ich8lan.c Mon Sep 17 00:44:11 2012 (r240578)
+++ stable/9/sys/dev/e1000/e1000_ich8lan.c Mon Sep 17 00:44:16 2012 (r240579)
@@ -3228,7 +3228,7 @@ out:
* @hw: pointer to the HW structure
*
* ICH8 use the PCI Express bus, but does not contain a PCI Express Capability
- * register, so the the bus width is hard coded.
+ * register, so the bus width is hard coded.
**/
static s32 e1000_get_bus_info_ich8lan(struct e1000_hw *hw)
{
Modified: stable/9/sys/dev/isci/scil/sati.c
==============================================================================
--- stable/9/sys/dev/isci/scil/sati.c Mon Sep 17 00:44:11 2012 (r240578)
+++ stable/9/sys/dev/isci/scil/sati.c Mon Sep 17 00:44:16 2012 (r240579)
@@ -1236,7 +1236,7 @@ void sati_sequence_terminate(
)
{
// Decode the sequence type to determine how to handle the termination
- // of the the translation method.
+ // of the translation method.
switch (sequence->type)
{
case SATI_SEQUENCE_UNMAP:
Modified: stable/9/sys/dev/isci/scil/sati_callbacks.h
==============================================================================
--- stable/9/sys/dev/isci/scil/sati_callbacks.h Mon Sep 17 00:44:11 2012 (r240578)
+++ stable/9/sys/dev/isci/scil/sati_callbacks.h Mon Sep 17 00:44:16 2012 (r240579)
@@ -153,7 +153,7 @@ void sati_cb_get_data_byte(
);
/**
- * @brief This callback method gets the the task type for the SCSI task
+ * @brief This callback method gets the task type for the SCSI task
* request.
*
* @param[in] scsi_task This parameter specifies the user's SCSI Task request.
Modified: stable/9/sys/dev/isci/scil/sci_base_controller.h
==============================================================================
--- stable/9/sys/dev/isci/scil/sci_base_controller.h Mon Sep 17 00:44:11 2012 (r240578)
+++ stable/9/sys/dev/isci/scil/sci_base_controller.h Mon Sep 17 00:44:16 2012 (r240579)
@@ -113,7 +113,7 @@ typedef enum _SCI_BASE_CONTROLLER_STATES
SCI_BASE_CONTROLLER_STATE_INITIALIZED,
/**
- * This state indicates the the controller is in the process of becoming
+ * This state indicates the controller is in the process of becoming
* ready (i.e. starting). In this state no new IO operations are permitted.
* This state is entered from the INITIALIZED state.
*/
Modified: stable/9/sys/dev/isci/scil/sci_base_domain.h
==============================================================================
--- stable/9/sys/dev/isci/scil/sci_base_domain.h Mon Sep 17 00:44:11 2012 (r240578)
+++ stable/9/sys/dev/isci/scil/sci_base_domain.h Mon Sep 17 00:44:16 2012 (r240579)
@@ -92,7 +92,7 @@ typedef enum _SCI_BASE_DOMAIN_STATES
SCI_BASE_DOMAIN_STATE_STARTING,
/**
- * This state indicates the the domain is now ready. Thus, the user
+ * This state indicates the domain is now ready. Thus, the user
* is able to perform IO operations to remote devices in this domain.
* This state is entered from the STOPPED state.
* This state is entered from the STOPPING state.
Modified: stable/9/sys/dev/isci/scil/sci_base_phy.h
==============================================================================
--- stable/9/sys/dev/isci/scil/sci_base_phy.h Mon Sep 17 00:44:11 2012 (r240578)
+++ stable/9/sys/dev/isci/scil/sci_base_phy.h Mon Sep 17 00:44:16 2012 (r240579)
@@ -102,7 +102,7 @@ typedef enum _SCI_BASE_PHY_STATES
SCI_BASE_PHY_STATE_STARTING,
/**
- * This state indicates the the phy is now ready. Thus, the user
+ * This state indicates the phy is now ready. Thus, the user
* is able to perform IO operations utilizing this phy as long as it
* is currently part of a valid port.
* This state is entered from the STARTING state.
Modified: stable/9/sys/dev/isci/scil/sci_base_remote_device.h
==============================================================================
--- stable/9/sys/dev/isci/scil/sci_base_remote_device.h Mon Sep 17 00:44:11 2012 (r240578)
+++ stable/9/sys/dev/isci/scil/sci_base_remote_device.h Mon Sep 17 00:44:16 2012 (r240579)
@@ -93,7 +93,7 @@ typedef enum _SCI_BASE_REMOTE_DEVICE_STA
SCI_BASE_REMOTE_DEVICE_STATE_STOPPED,
/**
- * This state indicates the the remote device is in the process of
+ * This state indicates the remote device is in the process of
* becoming ready (i.e. starting). In this state no new IO operations
* are permitted.
* This state is entered from the STOPPED state.
Modified: stable/9/sys/dev/isci/scil/scic_io_request.h
==============================================================================
--- stable/9/sys/dev/isci/scil/scic_io_request.h Mon Sep 17 00:44:11 2012 (r240578)
+++ stable/9/sys/dev/isci/scil/scic_io_request.h Mon Sep 17 00:44:16 2012 (r240579)
@@ -260,12 +260,12 @@ typedef struct SCIC_SMP_PASSTHRU_REQUEST
*/
U8 (* scic_cb_smp_passthru_get_frame_type) ( void *);
/**
- * Function pointer to get the function in the the smp request
+ * Function pointer to get the function in the smp request
*/
U8 (* scic_cb_smp_passthru_get_function) ( void * );
/**
- * Function pointer to get the "allocated response length" in the the smp request
+ * Function pointer to get the "allocated response length" in the smp request
*/
U8 (* scic_cb_smp_passthru_get_allocated_response_length) ( void * );
Modified: stable/9/sys/dev/isci/scil/scic_sds_phy.c
==============================================================================
--- stable/9/sys/dev/isci/scil/scic_sds_phy.c Mon Sep 17 00:44:11 2012 (r240578)
+++ stable/9/sys/dev/isci/scil/scic_sds_phy.c Mon Sep 17 00:44:16 2012 (r240579)
@@ -658,7 +658,7 @@ void scic_sds_phy_construct(
// Clear out the error counter data
memset(this_phy->error_counter, 0, sizeof(this_phy->error_counter));
- // Initialize the the substate machines
+ // Initialize the substate machines
sci_base_state_machine_construct(
&this_phy->starting_substate_machine,
&this_phy->parent.parent,
Modified: stable/9/sys/dev/isci/scil/scic_sds_port.h
==============================================================================
--- stable/9/sys/dev/isci/scil/scic_sds_port.h Mon Sep 17 00:44:11 2012 (r240578)
+++ stable/9/sys/dev/isci/scil/scic_sds_port.h Mon Sep 17 00:44:16 2012 (r240579)
@@ -109,7 +109,7 @@ struct SCIC_SDS_REQUEST;
/**
* @struct SCIC_SDS_PORT
*
- * The core port object provides the the abstraction for an SCU port.
+ * The core port object provides the abstraction for an SCU port.
*/
typedef struct SCIC_SDS_PORT
{
Modified: stable/9/sys/dev/isci/scil/scic_sds_remote_node_context.h
==============================================================================
--- stable/9/sys/dev/isci/scil/scic_sds_remote_node_context.h Mon Sep 17 00:44:11 2012 (r240578)
+++ stable/9/sys/dev/isci/scil/scic_sds_remote_node_context.h Mon Sep 17 00:44:16 2012 (r240579)
@@ -237,7 +237,7 @@ enum SCIC_SDS_REMOTE_NODE_CONTEXT_DESTIN
*
* @brief This structure contains the data associated with the remote
* node context object. The remote node context (RNC) object models
- * the the remote device information necessary to manage the
+ * the remote device information necessary to manage the
* silicon RNC.
*/
typedef struct SCIC_SDS_REMOTE_NODE_CONTEXT
Modified: stable/9/sys/dev/isci/scil/scic_sds_request.c
==============================================================================
--- stable/9/sys/dev/isci/scil/scic_sds_request.c Mon Sep 17 00:44:11 2012 (r240578)
+++ stable/9/sys/dev/isci/scil/scic_sds_request.c Mon Sep 17 00:44:16 2012 (r240579)
@@ -2679,7 +2679,7 @@ void scic_sds_request_initial_state_ente
/**
* This method implements the actions taken when entering the
* SCI_BASE_REQUEST_STATE_CONSTRUCTED state.
- * The method sets the state handlers for the the constructed state.
+ * The method sets the state handlers for the constructed state.
*
* @param[in] object The io request object that is to enter the constructed
* state.
Modified: stable/9/sys/dev/isci/scil/scu_bios_definitions.h
==============================================================================
--- stable/9/sys/dev/isci/scil/scu_bios_definitions.h Mon Sep 17 00:44:11 2012 (r240578)
+++ stable/9/sys/dev/isci/scil/scu_bios_definitions.h Mon Sep 17 00:44:16 2012 (r240579)
@@ -299,7 +299,7 @@ typedef struct SCI_BIOS_OEM_PARAM_ELEMEN
} sas_address;
/**
- * These are the per PHY equalization settings associated with the the
+ * These are the per PHY equalization settings associated with the
* AFE XCVR Tx Amplitude and Equalization Control Register Set
* (0 thru 3).
*
@@ -496,7 +496,7 @@ typedef struct SCI_BIOS_OEM_PARAM_ELEMEN
} sas_address;
/**
- * These are the per PHY equalization settings associated with the the
+ * These are the per PHY equalization settings associated with the
* AFE XCVR Tx Amplitude and Equalization Control Register Set
* (0 thru 3).
*
@@ -706,7 +706,7 @@ typedef struct SCI_BIOS_OEM_PARAM_ELEMEN
} sas_address;
/**
- * These are the per PHY equalization settings associated with the the
+ * These are the per PHY equalization settings associated with the
* AFE XCVR Tx Amplitude and Equalization Control Register Set
* (0 thru 3).
*
@@ -927,7 +927,7 @@ typedef struct SCI_BIOS_OEM_PARAM_ELEMEN
} sas_address;
/**
- * These are the per PHY equalization settings associated with the the
+ * These are the per PHY equalization settings associated with the
* AFE XCVR Tx Amplitude and Equalization Control Register Set
* (0 thru 3).
*
Modified: stable/9/sys/dev/isp/isp_freebsd.c
==============================================================================
--- stable/9/sys/dev/isp/isp_freebsd.c Mon Sep 17 00:44:11 2012 (r240578)
+++ stable/9/sys/dev/isp/isp_freebsd.c Mon Sep 17 00:44:16 2012 (r240579)
@@ -1889,7 +1889,7 @@ isp_target_start_ctio(ispsoftc_t *isp, u
* Mode 1, status, no data. Only possible when we are sending status, have
* no data to transfer, and the sense length can fit in the ct7_entry.
*
- * Mode 2, status, no data. We have to use this in the case the the response
+ * Mode 2, status, no data. We have to use this in the case the response
* length won't fit into a ct2_entry_t.
*
* We'll fill out this structure with information as if this were a
Modified: stable/9/sys/dev/mps/mps_sas.c
==============================================================================
--- stable/9/sys/dev/mps/mps_sas.c Mon Sep 17 00:44:11 2012 (r240578)
+++ stable/9/sys/dev/mps/mps_sas.c Mon Sep 17 00:44:16 2012 (r240579)
@@ -360,7 +360,7 @@ mpssas_remove_volume(struct mps_softc *s
mps_printf(sc, "Reset aborted %u commands\n", reply->TerminationCount);
mps_free_reply(sc, tm->cm_reply_data);
- tm->cm_reply = NULL; /* Ensures the the reply won't get re-freed */
+ tm->cm_reply = NULL; /* Ensures the reply won't get re-freed */
mps_printf(sc, "clearing target %u handle 0x%04x\n", targ->tid, handle);
@@ -550,7 +550,7 @@ mpssas_remove_device(struct mps_softc *s
mps_dprint(sc, MPS_INFO, "Reset aborted %u commands\n",
le32toh(reply->TerminationCount));
mps_free_reply(sc, tm->cm_reply_data);
- tm->cm_reply = NULL; /* Ensures the the reply won't get re-freed */
+ tm->cm_reply = NULL; /* Ensures the reply won't get re-freed */
/* Reuse the existing command */
req = (MPI2_SAS_IOUNIT_CONTROL_REQUEST *)tm->cm_req;
Modified: stable/9/sys/kern/subr_unit.c
==============================================================================
--- stable/9/sys/kern/subr_unit.c Mon Sep 17 00:44:11 2012 (r240578)
+++ stable/9/sys/kern/subr_unit.c Mon Sep 17 00:44:16 2012 (r240579)
@@ -63,7 +63,7 @@
* in the usermode test program included, the worst case usage
* was 798 bytes on i386 for 5000 allocated and 5000 free units.
* * The worst case is where every other unit number is allocated and
- * the the rest are free. In that case 44 + N/4 bytes are used where
+ * the rest are free. In that case 44 + N/4 bytes are used where
* N is the number of the highest unit allocated.
*/
Modified: stable/9/sys/sparc64/sparc64/ata_machdep.c
==============================================================================
--- stable/9/sys/sparc64/sparc64/ata_machdep.c Mon Sep 17 00:44:11 2012 (r240578)
+++ stable/9/sys/sparc64/sparc64/ata_machdep.c Mon Sep 17 00:44:16 2012 (r240579)
@@ -40,7 +40,7 @@ sparc64_ata_disk_firmware_geom_adjust(st
* and sectors so the geometry of large disks has to be adjusted.
* If the disk is > 32GB at 16 heads and 63 sectors, adjust to 255
* sectors (this matches what the OpenSolaris dad(7D) driver does).
- * If the the disk is even > 128GB, additionally adjust the heads to
+ * If the disk is even > 128GB, additionally adjust the heads to
* 255. This allows disks up to the 2TB limit of the extended VTOC8.
* XXX the OpenSolaris dad(7D) driver limits the mediasize to 128GB.
*/
Modified: stable/9/sys/vm/vm_pageout.c
==============================================================================
--- stable/9/sys/vm/vm_pageout.c Mon Sep 17 00:44:11 2012 (r240578)
+++ stable/9/sys/vm/vm_pageout.c Mon Sep 17 00:44:16 2012 (r240579)
@@ -755,7 +755,7 @@ vm_pageout_scan(int pass)
uma_reclaim();
/*
- * The addl_page_shortage is the the number of temporarily
+ * The addl_page_shortage is the number of temporarily
* stuck pages in the inactive queue. In other words, the
* number of pages from cnt.v_inactive_count that should be
* discounted in setting the target for the active queue scan.
Modified: stable/9/usr.sbin/tcpdump/tcpdump/tcpdump.1
==============================================================================
--- stable/9/usr.sbin/tcpdump/tcpdump/tcpdump.1 Mon Sep 17 00:44:11 2012 (r240578)
+++ stable/9/usr.sbin/tcpdump/tcpdump/tcpdump.1 Mon Sep 17 00:44:16 2012 (r240579)
@@ -1436,11 +1436,11 @@ not be useful to people who are not fami
AFS and RX.
.LP
If the -v (verbose) flag is given twice, acknowledgement packets and
-additional header information is printed, such as the the RX call ID,
+additional header information is printed, such as the RX call ID,
call number, sequence number, serial number, and the RX packet flags.
.LP
If the -v flag is given twice, additional information is printed,
-such as the the RX call ID, serial number, and the RX packet flags.
+such as the RX call ID, serial number, and the RX packet flags.
The MTU negotiation information is also printed from RX ack packets.
.LP
If the -v flag is given three times, the security index and service id
More information about the svn-src-stable
mailing list