diff options
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/block/biodoc.txt | 113 | ||||
-rw-r--r-- | Documentation/kernel-parameters.txt | 496 | ||||
-rw-r--r-- | Documentation/networking/bonding.txt | 5 |
3 files changed, 315 insertions, 299 deletions
diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt index 6dd274d7e1cf..2d65c2182161 100644 --- a/Documentation/block/biodoc.txt +++ b/Documentation/block/biodoc.txt | |||
@@ -906,9 +906,20 @@ Aside: | |||
906 | 906 | ||
907 | 907 | ||
908 | 4. The I/O scheduler | 908 | 4. The I/O scheduler |
909 | I/O schedulers are now per queue. They should be runtime switchable and modular | 909 | I/O scheduler, a.k.a. elevator, is implemented in two layers. Generic dispatch |
910 | but aren't yet. Jens has most bits to do this, but the sysfs implementation is | 910 | queue and specific I/O schedulers. Unless stated otherwise, elevator is used |
911 | missing. | 911 | to refer to both parts and I/O scheduler to specific I/O schedulers. |
912 | |||
913 | Block layer implements generic dispatch queue in ll_rw_blk.c and elevator.c. | ||
914 | The generic dispatch queue is responsible for properly ordering barrier | ||
915 | requests, requeueing, handling non-fs requests and all other subtleties. | ||
916 | |||
917 | Specific I/O schedulers are responsible for ordering normal filesystem | ||
918 | requests. They can also choose to delay certain requests to improve | ||
919 | throughput or whatever purpose. As the plural form indicates, there are | ||
920 | multiple I/O schedulers. They can be built as modules but at least one should | ||
921 | be built inside the kernel. Each queue can choose different one and can also | ||
922 | change to another one dynamically. | ||
912 | 923 | ||
913 | A block layer call to the i/o scheduler follows the convention elv_xxx(). This | 924 | A block layer call to the i/o scheduler follows the convention elv_xxx(). This |
914 | calls elevator_xxx_fn in the elevator switch (drivers/block/elevator.c). Oh, | 925 | calls elevator_xxx_fn in the elevator switch (drivers/block/elevator.c). Oh, |
@@ -921,44 +932,36 @@ keeping work. | |||
921 | The functions an elevator may implement are: (* are mandatory) | 932 | The functions an elevator may implement are: (* are mandatory) |
922 | elevator_merge_fn called to query requests for merge with a bio | 933 | elevator_merge_fn called to query requests for merge with a bio |
923 | 934 | ||
924 | elevator_merge_req_fn " " " with another request | 935 | elevator_merge_req_fn called when two requests get merged. the one |
936 | which gets merged into the other one will be | ||
937 | never seen by I/O scheduler again. IOW, after | ||
938 | being merged, the request is gone. | ||
925 | 939 | ||
926 | elevator_merged_fn called when a request in the scheduler has been | 940 | elevator_merged_fn called when a request in the scheduler has been |
927 | involved in a merge. It is used in the deadline | 941 | involved in a merge. It is used in the deadline |
928 | scheduler for example, to reposition the request | 942 | scheduler for example, to reposition the request |
929 | if its sorting order has changed. | 943 | if its sorting order has changed. |
930 | 944 | ||
931 | *elevator_next_req_fn returns the next scheduled request, or NULL | 945 | elevator_dispatch_fn fills the dispatch queue with ready requests. |
932 | if there are none (or none are ready). | 946 | I/O schedulers are free to postpone requests by |
947 | not filling the dispatch queue unless @force | ||
948 | is non-zero. Once dispatched, I/O schedulers | ||
949 | are not allowed to manipulate the requests - | ||
950 | they belong to generic dispatch queue. | ||
933 | 951 | ||
934 | *elevator_add_req_fn called to add a new request into the scheduler | 952 | elevator_add_req_fn called to add a new request into the scheduler |
935 | 953 | ||
936 | elevator_queue_empty_fn returns true if the merge queue is empty. | 954 | elevator_queue_empty_fn returns true if the merge queue is empty. |
937 | Drivers shouldn't use this, but rather check | 955 | Drivers shouldn't use this, but rather check |
938 | if elv_next_request is NULL (without losing the | 956 | if elv_next_request is NULL (without losing the |
939 | request if one exists!) | 957 | request if one exists!) |
940 | 958 | ||
941 | elevator_remove_req_fn This is called when a driver claims ownership of | ||
942 | the target request - it now belongs to the | ||
943 | driver. It must not be modified or merged. | ||
944 | Drivers must not lose the request! A subsequent | ||
945 | call of elevator_next_req_fn must return the | ||
946 | _next_ request. | ||
947 | |||
948 | elevator_requeue_req_fn called to add a request to the scheduler. This | ||
949 | is used when the request has alrnadebeen | ||
950 | returned by elv_next_request, but hasn't | ||
951 | completed. If this is not implemented then | ||
952 | elevator_add_req_fn is called instead. | ||
953 | |||
954 | elevator_former_req_fn | 959 | elevator_former_req_fn |
955 | elevator_latter_req_fn These return the request before or after the | 960 | elevator_latter_req_fn These return the request before or after the |
956 | one specified in disk sort order. Used by the | 961 | one specified in disk sort order. Used by the |
957 | block layer to find merge possibilities. | 962 | block layer to find merge possibilities. |
958 | 963 | ||
959 | elevator_completed_req_fn called when a request is completed. This might | 964 | elevator_completed_req_fn called when a request is completed. |
960 | come about due to being merged with another or | ||
961 | when the device completes the request. | ||
962 | 965 | ||
963 | elevator_may_queue_fn returns true if the scheduler wants to allow the | 966 | elevator_may_queue_fn returns true if the scheduler wants to allow the |
964 | current context to queue a new request even if | 967 | current context to queue a new request even if |
@@ -967,13 +970,33 @@ elevator_may_queue_fn returns true if the scheduler wants to allow the | |||
967 | 970 | ||
968 | elevator_set_req_fn | 971 | elevator_set_req_fn |
969 | elevator_put_req_fn Must be used to allocate and free any elevator | 972 | elevator_put_req_fn Must be used to allocate and free any elevator |
970 | specific storate for a request. | 973 | specific storage for a request. |
974 | |||
975 | elevator_activate_req_fn Called when device driver first sees a request. | ||
976 | I/O schedulers can use this callback to | ||
977 | determine when actual execution of a request | ||
978 | starts. | ||
979 | elevator_deactivate_req_fn Called when device driver decides to delay | ||
980 | a request by requeueing it. | ||
971 | 981 | ||
972 | elevator_init_fn | 982 | elevator_init_fn |
973 | elevator_exit_fn Allocate and free any elevator specific storage | 983 | elevator_exit_fn Allocate and free any elevator specific storage |
974 | for a queue. | 984 | for a queue. |
975 | 985 | ||
976 | 4.2 I/O scheduler implementation | 986 | 4.2 Request flows seen by I/O schedulers |
987 | All requests seens by I/O schedulers strictly follow one of the following three | ||
988 | flows. | ||
989 | |||
990 | set_req_fn -> | ||
991 | |||
992 | i. add_req_fn -> (merged_fn ->)* -> dispatch_fn -> activate_req_fn -> | ||
993 | (deactivate_req_fn -> activate_req_fn ->)* -> completed_req_fn | ||
994 | ii. add_req_fn -> (merged_fn ->)* -> merge_req_fn | ||
995 | iii. [none] | ||
996 | |||
997 | -> put_req_fn | ||
998 | |||
999 | 4.3 I/O scheduler implementation | ||
977 | The generic i/o scheduler algorithm attempts to sort/merge/batch requests for | 1000 | The generic i/o scheduler algorithm attempts to sort/merge/batch requests for |
978 | optimal disk scan and request servicing performance (based on generic | 1001 | optimal disk scan and request servicing performance (based on generic |
979 | principles and device capabilities), optimized for: | 1002 | principles and device capabilities), optimized for: |
@@ -993,18 +1016,7 @@ request in sort order to prevent binary tree lookups. | |||
993 | This arrangement is not a generic block layer characteristic however, so | 1016 | This arrangement is not a generic block layer characteristic however, so |
994 | elevators may implement queues as they please. | 1017 | elevators may implement queues as they please. |
995 | 1018 | ||
996 | ii. Last merge hint | 1019 | ii. Merge hash |
997 | The last merge hint is part of the generic queue layer. I/O schedulers must do | ||
998 | some management on it. For the most part, the most important thing is to make | ||
999 | sure q->last_merge is cleared (set to NULL) when the request on it is no longer | ||
1000 | a candidate for merging (for example if it has been sent to the driver). | ||
1001 | |||
1002 | The last merge performed is cached as a hint for the subsequent request. If | ||
1003 | sequential data is being submitted, the hint is used to perform merges without | ||
1004 | any scanning. This is not sufficient when there are multiple processes doing | ||
1005 | I/O though, so a "merge hash" is used by some schedulers. | ||
1006 | |||
1007 | iii. Merge hash | ||
1008 | AS and deadline use a hash table indexed by the last sector of a request. This | 1020 | AS and deadline use a hash table indexed by the last sector of a request. This |
1009 | enables merging code to quickly look up "back merge" candidates, even when | 1021 | enables merging code to quickly look up "back merge" candidates, even when |
1010 | multiple I/O streams are being performed at once on one disk. | 1022 | multiple I/O streams are being performed at once on one disk. |
@@ -1013,29 +1025,8 @@ multiple I/O streams are being performed at once on one disk. | |||
1013 | are far less common than "back merges" due to the nature of most I/O patterns. | 1025 | are far less common than "back merges" due to the nature of most I/O patterns. |
1014 | Front merges are handled by the binary trees in AS and deadline schedulers. | 1026 | Front merges are handled by the binary trees in AS and deadline schedulers. |
1015 | 1027 | ||
1016 | iv. Handling barrier cases | 1028 | iii. Plugging the queue to batch requests in anticipation of opportunities for |
1017 | A request with flags REQ_HARDBARRIER or REQ_SOFTBARRIER must not be ordered | 1029 | merge/sort optimizations |
1018 | around. That is, they must be processed after all older requests, and before | ||
1019 | any newer ones. This includes merges! | ||
1020 | |||
1021 | In AS and deadline schedulers, barriers have the effect of flushing the reorder | ||
1022 | queue. The performance cost of this will vary from nothing to a lot depending | ||
1023 | on i/o patterns and device characteristics. Obviously they won't improve | ||
1024 | performance, so their use should be kept to a minimum. | ||
1025 | |||
1026 | v. Handling insertion position directives | ||
1027 | A request may be inserted with a position directive. The directives are one of | ||
1028 | ELEVATOR_INSERT_BACK, ELEVATOR_INSERT_FRONT, ELEVATOR_INSERT_SORT. | ||
1029 | |||
1030 | ELEVATOR_INSERT_SORT is a general directive for non-barrier requests. | ||
1031 | ELEVATOR_INSERT_BACK is used to insert a barrier to the back of the queue. | ||
1032 | ELEVATOR_INSERT_FRONT is used to insert a barrier to the front of the queue, and | ||
1033 | overrides the ordering requested by any previous barriers. In practice this is | ||
1034 | harmless and required, because it is used for SCSI requeueing. This does not | ||
1035 | require flushing the reorder queue, so does not impose a performance penalty. | ||
1036 | |||
1037 | vi. Plugging the queue to batch requests in anticipation of opportunities for | ||
1038 | merge/sort optimizations | ||
1039 | 1030 | ||
1040 | This is just the same as in 2.4 so far, though per-device unplugging | 1031 | This is just the same as in 2.4 so far, though per-device unplugging |
1041 | support is anticipated for 2.5. Also with a priority-based i/o scheduler, | 1032 | support is anticipated for 2.5. Also with a priority-based i/o scheduler, |
@@ -1069,7 +1060,7 @@ Aside: | |||
1069 | blk_kick_queue() to unplug a specific queue (right away ?) | 1060 | blk_kick_queue() to unplug a specific queue (right away ?) |
1070 | or optionally, all queues, is in the plan. | 1061 | or optionally, all queues, is in the plan. |
1071 | 1062 | ||
1072 | 4.3 I/O contexts | 1063 | 4.4 I/O contexts |
1073 | I/O contexts provide a dynamically allocated per process data area. They may | 1064 | I/O contexts provide a dynamically allocated per process data area. They may |
1074 | be used in I/O schedulers, and in the block layer (could be used for IO statis, | 1065 | be used in I/O schedulers, and in the block layer (could be used for IO statis, |
1075 | priorities for example). See *io_context in drivers/block/ll_rw_blk.c, and | 1066 | priorities for example). See *io_context in drivers/block/ll_rw_blk.c, and |
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 7086f0a90d14..971589a9752d 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -17,7 +17,7 @@ are specified on the kernel command line with the module name plus | |||
17 | 17 | ||
18 | usbcore.blinkenlights=1 | 18 | usbcore.blinkenlights=1 |
19 | 19 | ||
20 | The text in square brackets at the beginning of the description state the | 20 | The text in square brackets at the beginning of the description states the |
21 | restrictions on the kernel for the said kernel parameter to be valid. The | 21 | restrictions on the kernel for the said kernel parameter to be valid. The |
22 | restrictions referred to are that the relevant option is valid if: | 22 | restrictions referred to are that the relevant option is valid if: |
23 | 23 | ||
@@ -27,8 +27,8 @@ restrictions referred to are that the relevant option is valid if: | |||
27 | APM Advanced Power Management support is enabled. | 27 | APM Advanced Power Management support is enabled. |
28 | AX25 Appropriate AX.25 support is enabled. | 28 | AX25 Appropriate AX.25 support is enabled. |
29 | CD Appropriate CD support is enabled. | 29 | CD Appropriate CD support is enabled. |
30 | DEVFS devfs support is enabled. | 30 | DEVFS devfs support is enabled. |
31 | DRM Direct Rendering Management support is enabled. | 31 | DRM Direct Rendering Management support is enabled. |
32 | EDD BIOS Enhanced Disk Drive Services (EDD) is enabled | 32 | EDD BIOS Enhanced Disk Drive Services (EDD) is enabled |
33 | EFI EFI Partitioning (GPT) is enabled | 33 | EFI EFI Partitioning (GPT) is enabled |
34 | EIDE EIDE/ATAPI support is enabled. | 34 | EIDE EIDE/ATAPI support is enabled. |
@@ -71,7 +71,7 @@ restrictions referred to are that the relevant option is valid if: | |||
71 | SERIAL Serial support is enabled. | 71 | SERIAL Serial support is enabled. |
72 | SMP The kernel is an SMP kernel. | 72 | SMP The kernel is an SMP kernel. |
73 | SPARC Sparc architecture is enabled. | 73 | SPARC Sparc architecture is enabled. |
74 | SWSUSP Software suspension is enabled. | 74 | SWSUSP Software suspend is enabled. |
75 | TS Appropriate touchscreen support is enabled. | 75 | TS Appropriate touchscreen support is enabled. |
76 | USB USB support is enabled. | 76 | USB USB support is enabled. |
77 | USBHID USB Human Interface Device support is enabled. | 77 | USBHID USB Human Interface Device support is enabled. |
@@ -105,13 +105,13 @@ running once the system is up. | |||
105 | See header of drivers/scsi/53c7xx.c. | 105 | See header of drivers/scsi/53c7xx.c. |
106 | See also Documentation/scsi/ncr53c7xx.txt. | 106 | See also Documentation/scsi/ncr53c7xx.txt. |
107 | 107 | ||
108 | acpi= [HW,ACPI] Advanced Configuration and Power Interface | 108 | acpi= [HW,ACPI] Advanced Configuration and Power Interface |
109 | Format: { force | off | ht | strict } | 109 | Format: { force | off | ht | strict | noirq } |
110 | force -- enable ACPI if default was off | 110 | force -- enable ACPI if default was off |
111 | off -- disable ACPI if default was on | 111 | off -- disable ACPI if default was on |
112 | noirq -- do not use ACPI for IRQ routing | 112 | noirq -- do not use ACPI for IRQ routing |
113 | ht -- run only enough ACPI to enable Hyper Threading | 113 | ht -- run only enough ACPI to enable Hyper Threading |
114 | strict -- Be less tolerant of platforms that are not | 114 | strict -- Be less tolerant of platforms that are not |
115 | strictly ACPI specification compliant. | 115 | strictly ACPI specification compliant. |
116 | 116 | ||
117 | See also Documentation/pm.txt, pci=noacpi | 117 | See also Documentation/pm.txt, pci=noacpi |
@@ -119,20 +119,23 @@ running once the system is up. | |||
119 | acpi_sleep= [HW,ACPI] Sleep options | 119 | acpi_sleep= [HW,ACPI] Sleep options |
120 | Format: { s3_bios, s3_mode } | 120 | Format: { s3_bios, s3_mode } |
121 | See Documentation/power/video.txt | 121 | See Documentation/power/video.txt |
122 | 122 | ||
123 | acpi_sci= [HW,ACPI] ACPI System Control Interrupt trigger mode | 123 | acpi_sci= [HW,ACPI] ACPI System Control Interrupt trigger mode |
124 | Format: { level | edge | high | low } | 124 | Format: { level | edge | high | low } |
125 | 125 | ||
126 | acpi_irq_balance [HW,ACPI] ACPI will balance active IRQs | 126 | acpi_irq_balance [HW,ACPI] |
127 | default in APIC mode | 127 | ACPI will balance active IRQs |
128 | default in APIC mode | ||
128 | 129 | ||
129 | acpi_irq_nobalance [HW,ACPI] ACPI will not move active IRQs (default) | 130 | acpi_irq_nobalance [HW,ACPI] |
130 | default in PIC mode | 131 | ACPI will not move active IRQs (default) |
132 | default in PIC mode | ||
131 | 133 | ||
132 | acpi_irq_pci= [HW,ACPI] If irq_balance, Clear listed IRQs for use by PCI | 134 | acpi_irq_pci= [HW,ACPI] If irq_balance, clear listed IRQs for |
135 | use by PCI | ||
133 | Format: <irq>,<irq>... | 136 | Format: <irq>,<irq>... |
134 | 137 | ||
135 | acpi_irq_isa= [HW,ACPI] If irq_balance, Mark listed IRQs used by ISA | 138 | acpi_irq_isa= [HW,ACPI] If irq_balance, mark listed IRQs used by ISA |
136 | Format: <irq>,<irq>... | 139 | Format: <irq>,<irq>... |
137 | 140 | ||
138 | acpi_osi= [HW,ACPI] empty param disables _OSI | 141 | acpi_osi= [HW,ACPI] empty param disables _OSI |
@@ -145,14 +148,14 @@ running once the system is up. | |||
145 | 148 | ||
146 | acpi_dbg_layer= [HW,ACPI] | 149 | acpi_dbg_layer= [HW,ACPI] |
147 | Format: <int> | 150 | Format: <int> |
148 | Each bit of the <int> indicates an acpi debug layer, | 151 | Each bit of the <int> indicates an ACPI debug layer, |
149 | 1: enable, 0: disable. It is useful for boot time | 152 | 1: enable, 0: disable. It is useful for boot time |
150 | debugging. After system has booted up, it can be set | 153 | debugging. After system has booted up, it can be set |
151 | via /proc/acpi/debug_layer. | 154 | via /proc/acpi/debug_layer. |
152 | 155 | ||
153 | acpi_dbg_level= [HW,ACPI] | 156 | acpi_dbg_level= [HW,ACPI] |
154 | Format: <int> | 157 | Format: <int> |
155 | Each bit of the <int> indicates an acpi debug level, | 158 | Each bit of the <int> indicates an ACPI debug level, |
156 | 1: enable, 0: disable. It is useful for boot time | 159 | 1: enable, 0: disable. It is useful for boot time |
157 | debugging. After system has booted up, it can be set | 160 | debugging. After system has booted up, it can be set |
158 | via /proc/acpi/debug_level. | 161 | via /proc/acpi/debug_level. |
@@ -161,12 +164,13 @@ running once the system is up. | |||
161 | 164 | ||
162 | acpi_generic_hotkey [HW,ACPI] | 165 | acpi_generic_hotkey [HW,ACPI] |
163 | Allow consolidated generic hotkey driver to | 166 | Allow consolidated generic hotkey driver to |
164 | over-ride platform specific driver. | 167 | override platform specific driver. |
165 | See also Documentation/acpi-hotkey.txt. | 168 | See also Documentation/acpi-hotkey.txt. |
166 | 169 | ||
167 | enable_timer_pin_1 [i386,x86-64] | 170 | enable_timer_pin_1 [i386,x86-64] |
168 | Enable PIN 1 of APIC timer | 171 | Enable PIN 1 of APIC timer |
169 | Can be useful to work around chipset bugs (in particular on some ATI chipsets) | 172 | Can be useful to work around chipset bugs |
173 | (in particular on some ATI chipsets). | ||
170 | The kernel tries to set a reasonable default. | 174 | The kernel tries to set a reasonable default. |
171 | 175 | ||
172 | disable_timer_pin_1 [i386,x86-64] | 176 | disable_timer_pin_1 [i386,x86-64] |
@@ -182,7 +186,7 @@ running once the system is up. | |||
182 | 186 | ||
183 | adlib= [HW,OSS] | 187 | adlib= [HW,OSS] |
184 | Format: <io> | 188 | Format: <io> |
185 | 189 | ||
186 | advansys= [HW,SCSI] | 190 | advansys= [HW,SCSI] |
187 | See header of drivers/scsi/advansys.c. | 191 | See header of drivers/scsi/advansys.c. |
188 | 192 | ||
@@ -192,7 +196,7 @@ running once the system is up. | |||
192 | aedsp16= [HW,OSS] Audio Excel DSP 16 | 196 | aedsp16= [HW,OSS] Audio Excel DSP 16 |
193 | Format: <io>,<irq>,<dma>,<mss_io>,<mpu_io>,<mpu_irq> | 197 | Format: <io>,<irq>,<dma>,<mss_io>,<mpu_io>,<mpu_irq> |
194 | See also header of sound/oss/aedsp16.c. | 198 | See also header of sound/oss/aedsp16.c. |
195 | 199 | ||
196 | aha152x= [HW,SCSI] | 200 | aha152x= [HW,SCSI] |
197 | See Documentation/scsi/aha152x.txt. | 201 | See Documentation/scsi/aha152x.txt. |
198 | 202 | ||
@@ -205,10 +209,6 @@ running once the system is up. | |||
205 | aic79xx= [HW,SCSI] | 209 | aic79xx= [HW,SCSI] |
206 | See Documentation/scsi/aic79xx.txt. | 210 | See Documentation/scsi/aic79xx.txt. |
207 | 211 | ||
208 | AM53C974= [HW,SCSI] | ||
209 | Format: <host-scsi-id>,<target-scsi-id>,<max-rate>,<max-offset> | ||
210 | See also header of drivers/scsi/AM53C974.c. | ||
211 | |||
212 | amijoy.map= [HW,JOY] Amiga joystick support | 212 | amijoy.map= [HW,JOY] Amiga joystick support |
213 | Map of devices attached to JOY0DAT and JOY1DAT | 213 | Map of devices attached to JOY0DAT and JOY1DAT |
214 | Format: <a>,<b> | 214 | Format: <a>,<b> |
@@ -219,23 +219,24 @@ running once the system is up. | |||
219 | connected to one of 16 gameports | 219 | connected to one of 16 gameports |
220 | Format: <type1>,<type2>,..<type16> | 220 | Format: <type1>,<type2>,..<type16> |
221 | 221 | ||
222 | apc= [HW,SPARC] Power management functions (SPARCstation-4/5 + deriv.) | 222 | apc= [HW,SPARC] |
223 | Power management functions (SPARCstation-4/5 + deriv.) | ||
223 | Format: noidle | 224 | Format: noidle |
224 | Disable APC CPU standby support. SPARCstation-Fox does | 225 | Disable APC CPU standby support. SPARCstation-Fox does |
225 | not play well with APC CPU idle - disable it if you have | 226 | not play well with APC CPU idle - disable it if you have |
226 | APC and your system crashes randomly. | 227 | APC and your system crashes randomly. |
227 | 228 | ||
228 | apic= [APIC,i386] Change the output verbosity whilst booting | 229 | apic= [APIC,i386] Change the output verbosity whilst booting |
229 | Format: { quiet (default) | verbose | debug } | 230 | Format: { quiet (default) | verbose | debug } |
230 | Change the amount of debugging information output | 231 | Change the amount of debugging information output |
231 | when initialising the APIC and IO-APIC components. | 232 | when initialising the APIC and IO-APIC components. |
232 | 233 | ||
233 | apm= [APM] Advanced Power Management | 234 | apm= [APM] Advanced Power Management |
234 | See header of arch/i386/kernel/apm.c. | 235 | See header of arch/i386/kernel/apm.c. |
235 | 236 | ||
236 | applicom= [HW] | 237 | applicom= [HW] |
237 | Format: <mem>,<irq> | 238 | Format: <mem>,<irq> |
238 | 239 | ||
239 | arcrimi= [HW,NET] ARCnet - "RIM I" (entirely mem-mapped) cards | 240 | arcrimi= [HW,NET] ARCnet - "RIM I" (entirely mem-mapped) cards |
240 | Format: <io>,<irq>,<nodeID> | 241 | Format: <io>,<irq>,<nodeID> |
241 | 242 | ||
@@ -250,38 +251,40 @@ running once the system is up. | |||
250 | 251 | ||
251 | atkbd.reset= [HW] Reset keyboard during initialization | 252 | atkbd.reset= [HW] Reset keyboard during initialization |
252 | 253 | ||
253 | atkbd.set= [HW] Select keyboard code set | 254 | atkbd.set= [HW] Select keyboard code set |
254 | Format: <int> (2 = AT (default) 3 = PS/2) | 255 | Format: <int> (2 = AT (default), 3 = PS/2) |
255 | 256 | ||
256 | atkbd.scroll= [HW] Enable scroll wheel on MS Office and similar | 257 | atkbd.scroll= [HW] Enable scroll wheel on MS Office and similar |
257 | keyboards | 258 | keyboards |
258 | 259 | ||
259 | atkbd.softraw= [HW] Choose between synthetic and real raw mode | 260 | atkbd.softraw= [HW] Choose between synthetic and real raw mode |
260 | Format: <bool> (0 = real, 1 = synthetic (default)) | 261 | Format: <bool> (0 = real, 1 = synthetic (default)) |
261 | 262 | ||
262 | atkbd.softrepeat= | 263 | atkbd.softrepeat= [HW] |
263 | [HW] Use software keyboard repeat | 264 | Use software keyboard repeat |
264 | 265 | ||
265 | autotest [IA64] | 266 | autotest [IA64] |
266 | 267 | ||
267 | awe= [HW,OSS] AWE32/SB32/AWE64 wave table synth | 268 | awe= [HW,OSS] AWE32/SB32/AWE64 wave table synth |
268 | Format: <io>,<memsize>,<isapnp> | 269 | Format: <io>,<memsize>,<isapnp> |
269 | 270 | ||
270 | aztcd= [HW,CD] Aztech CD268 CDROM driver | 271 | aztcd= [HW,CD] Aztech CD268 CDROM driver |
271 | Format: <io>,0x79 (?) | 272 | Format: <io>,0x79 (?) |
272 | 273 | ||
273 | baycom_epp= [HW,AX25] | 274 | baycom_epp= [HW,AX25] |
274 | Format: <io>,<mode> | 275 | Format: <io>,<mode> |
275 | 276 | ||
276 | baycom_par= [HW,AX25] BayCom Parallel Port AX.25 Modem | 277 | baycom_par= [HW,AX25] BayCom Parallel Port AX.25 Modem |
277 | Format: <io>,<mode> | 278 | Format: <io>,<mode> |
278 | See header of drivers/net/hamradio/baycom_par.c. | 279 | See header of drivers/net/hamradio/baycom_par.c. |
279 | 280 | ||
280 | baycom_ser_fdx= [HW,AX25] BayCom Serial Port AX.25 Modem (Full Duplex Mode) | 281 | baycom_ser_fdx= [HW,AX25] |
282 | BayCom Serial Port AX.25 Modem (Full Duplex Mode) | ||
281 | Format: <io>,<irq>,<mode>[,<baud>] | 283 | Format: <io>,<irq>,<mode>[,<baud>] |
282 | See header of drivers/net/hamradio/baycom_ser_fdx.c. | 284 | See header of drivers/net/hamradio/baycom_ser_fdx.c. |
283 | 285 | ||
284 | baycom_ser_hdx= [HW,AX25] BayCom Serial Port AX.25 Modem (Half Duplex Mode) | 286 | baycom_ser_hdx= [HW,AX25] |
287 | BayCom Serial Port AX.25 Modem (Half Duplex Mode) | ||
285 | Format: <io>,<irq>,<mode> | 288 | Format: <io>,<irq>,<mode> |
286 | See header of drivers/net/hamradio/baycom_ser_hdx.c. | 289 | See header of drivers/net/hamradio/baycom_ser_hdx.c. |
287 | 290 | ||
@@ -292,7 +295,8 @@ running once the system is up. | |||
292 | blkmtd_count= | 295 | blkmtd_count= |
293 | 296 | ||
294 | bttv.card= [HW,V4L] bttv (bt848 + bt878 based grabber cards) | 297 | bttv.card= [HW,V4L] bttv (bt848 + bt878 based grabber cards) |
295 | bttv.radio= Most important insmod options are available as kernel args too. | 298 | bttv.radio= Most important insmod options are available as |
299 | kernel args too. | ||
296 | bttv.pll= See Documentation/video4linux/bttv/Insmod-options | 300 | bttv.pll= See Documentation/video4linux/bttv/Insmod-options |
297 | bttv.tuner= and Documentation/video4linux/bttv/CARDLIST | 301 | bttv.tuner= and Documentation/video4linux/bttv/CARDLIST |
298 | 302 | ||
@@ -318,15 +322,17 @@ running once the system is up. | |||
318 | checkreqprot [SELINUX] Set initial checkreqprot flag value. | 322 | checkreqprot [SELINUX] Set initial checkreqprot flag value. |
319 | Format: { "0" | "1" } | 323 | Format: { "0" | "1" } |
320 | See security/selinux/Kconfig help text. | 324 | See security/selinux/Kconfig help text. |
321 | 0 -- check protection applied by kernel (includes any implied execute protection). | 325 | 0 -- check protection applied by kernel (includes |
326 | any implied execute protection). | ||
322 | 1 -- check protection requested by application. | 327 | 1 -- check protection requested by application. |
323 | Default value is set via a kernel config option. | 328 | Default value is set via a kernel config option. |
324 | Value can be changed at runtime via /selinux/checkreqprot. | 329 | Value can be changed at runtime via |
325 | 330 | /selinux/checkreqprot. | |
326 | clock= [BUGS=IA-32, HW] gettimeofday timesource override. | 331 | |
332 | clock= [BUGS=IA-32,HW] gettimeofday timesource override. | ||
327 | Forces specified timesource (if avaliable) to be used | 333 | Forces specified timesource (if avaliable) to be used |
328 | when calculating gettimeofday(). If specicified timesource | 334 | when calculating gettimeofday(). If specicified |
329 | is not avalible, it defaults to PIT. | 335 | timesource is not avalible, it defaults to PIT. |
330 | Format: { pit | tsc | cyclone | pmtmr } | 336 | Format: { pit | tsc | cyclone | pmtmr } |
331 | 337 | ||
332 | hpet= [IA-32,HPET] option to disable HPET and use PIT. | 338 | hpet= [IA-32,HPET] option to disable HPET and use PIT. |
@@ -336,17 +342,19 @@ running once the system is up. | |||
336 | Format: { auto | [<io>,][<irq>] } | 342 | Format: { auto | [<io>,][<irq>] } |
337 | 343 | ||
338 | com20020= [HW,NET] ARCnet - COM20020 chipset | 344 | com20020= [HW,NET] ARCnet - COM20020 chipset |
339 | Format: <io>[,<irq>[,<nodeID>[,<backplane>[,<ckp>[,<timeout>]]]]] | 345 | Format: |
346 | <io>[,<irq>[,<nodeID>[,<backplane>[,<ckp>[,<timeout>]]]]] | ||
340 | 347 | ||
341 | com90io= [HW,NET] ARCnet - COM90xx chipset (IO-mapped buffers) | 348 | com90io= [HW,NET] ARCnet - COM90xx chipset (IO-mapped buffers) |
342 | Format: <io>[,<irq>] | 349 | Format: <io>[,<irq>] |
343 | 350 | ||
344 | com90xx= [HW,NET] ARCnet - COM90xx chipset (memory-mapped buffers) | 351 | com90xx= [HW,NET] |
352 | ARCnet - COM90xx chipset (memory-mapped buffers) | ||
345 | Format: <io>[,<irq>[,<memstart>]] | 353 | Format: <io>[,<irq>[,<memstart>]] |
346 | 354 | ||
347 | condev= [HW,S390] console device | 355 | condev= [HW,S390] console device |
348 | conmode= | 356 | conmode= |
349 | 357 | ||
350 | console= [KNL] Output console device and options. | 358 | console= [KNL] Output console device and options. |
351 | 359 | ||
352 | tty<n> Use the virtual console device <n>. | 360 | tty<n> Use the virtual console device <n>. |
@@ -367,7 +375,8 @@ running once the system is up. | |||
367 | options are the same as for ttyS, above. | 375 | options are the same as for ttyS, above. |
368 | 376 | ||
369 | cpcihp_generic= [HW,PCI] Generic port I/O CompactPCI driver | 377 | cpcihp_generic= [HW,PCI] Generic port I/O CompactPCI driver |
370 | Format: <first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>] | 378 | Format: |
379 | <first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>] | ||
371 | 380 | ||
372 | cpia_pp= [HW,PPT] | 381 | cpia_pp= [HW,PPT] |
373 | Format: { parport<nr> | auto | none } | 382 | Format: { parport<nr> | auto | none } |
@@ -384,10 +393,10 @@ running once the system is up. | |||
384 | 393 | ||
385 | cs89x0_media= [HW,NET] | 394 | cs89x0_media= [HW,NET] |
386 | Format: { rj45 | aui | bnc } | 395 | Format: { rj45 | aui | bnc } |
387 | 396 | ||
388 | cyclades= [HW,SERIAL] Cyclades multi-serial port adapter. | 397 | cyclades= [HW,SERIAL] Cyclades multi-serial port adapter. |
389 | 398 | ||
390 | dasd= [HW,NET] | 399 | dasd= [HW,NET] |
391 | See header of drivers/s390/block/dasd_devmap.c. | 400 | See header of drivers/s390/block/dasd_devmap.c. |
392 | 401 | ||
393 | db9.dev[2|3]= [HW,JOY] Multisystem joystick support via parallel port | 402 | db9.dev[2|3]= [HW,JOY] Multisystem joystick support via parallel port |
@@ -406,7 +415,7 @@ running once the system is up. | |||
406 | 415 | ||
407 | dhash_entries= [KNL] | 416 | dhash_entries= [KNL] |
408 | Set number of hash buckets for dentry cache. | 417 | Set number of hash buckets for dentry cache. |
409 | 418 | ||
410 | digi= [HW,SERIAL] | 419 | digi= [HW,SERIAL] |
411 | IO parameters + enable/disable command. | 420 | IO parameters + enable/disable command. |
412 | 421 | ||
@@ -424,11 +433,11 @@ running once the system is up. | |||
424 | 433 | ||
425 | dtc3181e= [HW,SCSI] | 434 | dtc3181e= [HW,SCSI] |
426 | 435 | ||
427 | earlyprintk= [IA-32, X86-64] | 436 | earlyprintk= [IA-32,X86-64] |
428 | earlyprintk=vga | 437 | earlyprintk=vga |
429 | earlyprintk=serial[,ttySn[,baudrate]] | 438 | earlyprintk=serial[,ttySn[,baudrate]] |
430 | 439 | ||
431 | Append ,keep to not disable it when the real console | 440 | Append ",keep" to not disable it when the real console |
432 | takes over. | 441 | takes over. |
433 | 442 | ||
434 | Only vga or serial at a time, not both. | 443 | Only vga or serial at a time, not both. |
@@ -451,7 +460,7 @@ running once the system is up. | |||
451 | Format: {"of[f]" | "sk[ipmbr]"} | 460 | Format: {"of[f]" | "sk[ipmbr]"} |
452 | See comment in arch/i386/boot/edd.S | 461 | See comment in arch/i386/boot/edd.S |
453 | 462 | ||
454 | eicon= [HW,ISDN] | 463 | eicon= [HW,ISDN] |
455 | Format: <id>,<membase>,<irq> | 464 | Format: <id>,<membase>,<irq> |
456 | 465 | ||
457 | eisa_irq_edge= [PARISC,HW] | 466 | eisa_irq_edge= [PARISC,HW] |
@@ -462,12 +471,13 @@ running once the system is up. | |||
462 | arch/i386/kernel/cpu/cpufreq/elanfreq.c. | 471 | arch/i386/kernel/cpu/cpufreq/elanfreq.c. |
463 | 472 | ||
464 | elevator= [IOSCHED] | 473 | elevator= [IOSCHED] |
465 | Format: {"as"|"cfq"|"deadline"|"noop"} | 474 | Format: {"as" | "cfq" | "deadline" | "noop"} |
466 | See Documentation/block/as-iosched.txt | 475 | See Documentation/block/as-iosched.txt and |
467 | and Documentation/block/deadline-iosched.txt for details. | 476 | Documentation/block/deadline-iosched.txt for details. |
477 | |||
468 | elfcorehdr= [IA-32] | 478 | elfcorehdr= [IA-32] |
469 | Specifies physical address of start of kernel core image | 479 | Specifies physical address of start of kernel core |
470 | elf header. | 480 | image elf header. |
471 | See Documentation/kdump.txt for details. | 481 | See Documentation/kdump.txt for details. |
472 | 482 | ||
473 | enforcing [SELINUX] Set initial enforcing status. | 483 | enforcing [SELINUX] Set initial enforcing status. |
@@ -485,7 +495,7 @@ running once the system is up. | |||
485 | es1371= [HW,OSS] | 495 | es1371= [HW,OSS] |
486 | Format: <spdif>,[<nomix>,[<amplifier>]] | 496 | Format: <spdif>,[<nomix>,[<amplifier>]] |
487 | See also header of sound/oss/es1371.c. | 497 | See also header of sound/oss/es1371.c. |
488 | 498 | ||
489 | ether= [HW,NET] Ethernet cards parameters | 499 | ether= [HW,NET] Ethernet cards parameters |
490 | This option is obsoleted by the "netdev=" option, which | 500 | This option is obsoleted by the "netdev=" option, which |
491 | has equivalent usage. See its documentation for details. | 501 | has equivalent usage. See its documentation for details. |
@@ -526,12 +536,13 @@ running once the system is up. | |||
526 | 536 | ||
527 | gus= [HW,OSS] | 537 | gus= [HW,OSS] |
528 | Format: <io>,<irq>,<dma>,<dma16> | 538 | Format: <io>,<irq>,<dma>,<dma16> |
529 | 539 | ||
530 | gvp11= [HW,SCSI] | 540 | gvp11= [HW,SCSI] |
531 | 541 | ||
532 | hashdist= [KNL,NUMA] Large hashes allocated during boot | 542 | hashdist= [KNL,NUMA] Large hashes allocated during boot |
533 | are distributed across NUMA nodes. Defaults on | 543 | are distributed across NUMA nodes. Defaults on |
534 | for IA-64, off otherwise. | 544 | for IA-64, off otherwise. |
545 | Format: 0 | 1 (for off | on) | ||
535 | 546 | ||
536 | hcl= [IA-64] SGI's Hardware Graph compatibility layer | 547 | hcl= [IA-64] SGI's Hardware Graph compatibility layer |
537 | 548 | ||
@@ -595,13 +606,13 @@ running once the system is up. | |||
595 | ide?= [HW] (E)IDE subsystem | 606 | ide?= [HW] (E)IDE subsystem |
596 | Format: ide?=noprobe or chipset specific parameters. | 607 | Format: ide?=noprobe or chipset specific parameters. |
597 | See Documentation/ide.txt. | 608 | See Documentation/ide.txt. |
598 | 609 | ||
599 | idebus= [HW] (E)IDE subsystem - VLB/PCI bus speed | 610 | idebus= [HW] (E)IDE subsystem - VLB/PCI bus speed |
600 | See Documentation/ide.txt. | 611 | See Documentation/ide.txt. |
601 | 612 | ||
602 | idle= [HW] | 613 | idle= [HW] |
603 | Format: idle=poll or idle=halt | 614 | Format: idle=poll or idle=halt |
604 | 615 | ||
605 | ihash_entries= [KNL] | 616 | ihash_entries= [KNL] |
606 | Set number of hash buckets for inode cache. | 617 | Set number of hash buckets for inode cache. |
607 | 618 | ||
@@ -649,7 +660,7 @@ running once the system is up. | |||
649 | firmware running. | 660 | firmware running. |
650 | 661 | ||
651 | isapnp= [ISAPNP] | 662 | isapnp= [ISAPNP] |
652 | Format: <RDP>, <reset>, <pci_scan>, <verbosity> | 663 | Format: <RDP>,<reset>,<pci_scan>,<verbosity> |
653 | 664 | ||
654 | isolcpus= [KNL,SMP] Isolate CPUs from the general scheduler. | 665 | isolcpus= [KNL,SMP] Isolate CPUs from the general scheduler. |
655 | Format: <cpu number>,...,<cpu number> | 666 | Format: <cpu number>,...,<cpu number> |
@@ -661,32 +672,33 @@ running once the system is up. | |||
661 | "number of CPUs in system - 1". | 672 | "number of CPUs in system - 1". |
662 | 673 | ||
663 | This option is the preferred way to isolate CPUs. The | 674 | This option is the preferred way to isolate CPUs. The |
664 | alternative - manually setting the CPU mask of all tasks | 675 | alternative -- manually setting the CPU mask of all |
665 | in the system can cause problems and suboptimal load | 676 | tasks in the system -- can cause problems and |
666 | balancer performance. | 677 | suboptimal load balancer performance. |
667 | 678 | ||
668 | isp16= [HW,CD] | 679 | isp16= [HW,CD] |
669 | Format: <io>,<irq>,<dma>,<setup> | 680 | Format: <io>,<irq>,<dma>,<setup> |
670 | 681 | ||
671 | iucv= [HW,NET] | 682 | iucv= [HW,NET] |
672 | 683 | ||
673 | js= [HW,JOY] Analog joystick | 684 | js= [HW,JOY] Analog joystick |
674 | See Documentation/input/joystick.txt. | 685 | See Documentation/input/joystick.txt. |
675 | 686 | ||
676 | keepinitrd [HW,ARM] | 687 | keepinitrd [HW,ARM] |
677 | 688 | ||
678 | kstack=N [IA-32, X86-64] Print N words from the kernel stack | 689 | kstack=N [IA-32,X86-64] Print N words from the kernel stack |
679 | in oops dumps. | 690 | in oops dumps. |
680 | 691 | ||
681 | l2cr= [PPC] | 692 | l2cr= [PPC] |
682 | 693 | ||
683 | lapic [IA-32,APIC] Enable the local APIC even if BIOS disabled it. | 694 | lapic [IA-32,APIC] Enable the local APIC even if BIOS |
695 | disabled it. | ||
684 | 696 | ||
685 | lasi= [HW,SCSI] PARISC LASI driver for the 53c700 chip | 697 | lasi= [HW,SCSI] PARISC LASI driver for the 53c700 chip |
686 | Format: addr:<io>,irq:<irq> | 698 | Format: addr:<io>,irq:<irq> |
687 | 699 | ||
688 | llsc*= [IA64] | 700 | llsc*= [IA64] See function print_params() in |
689 | See function print_params() in arch/ia64/sn/kernel/llsc4.c. | 701 | arch/ia64/sn/kernel/llsc4.c. |
690 | 702 | ||
691 | load_ramdisk= [RAM] List of ramdisks to load from floppy | 703 | load_ramdisk= [RAM] List of ramdisks to load from floppy |
692 | See Documentation/ramdisk.txt. | 704 | See Documentation/ramdisk.txt. |
@@ -713,8 +725,9 @@ running once the system is up. | |||
713 | 7 (KERN_DEBUG) debug-level messages | 725 | 7 (KERN_DEBUG) debug-level messages |
714 | 726 | ||
715 | log_buf_len=n Sets the size of the printk ring buffer, in bytes. | 727 | log_buf_len=n Sets the size of the printk ring buffer, in bytes. |
716 | Format is n, nk, nM. n must be a power of two. The | 728 | Format: { n | nk | nM } |
717 | default is set in kernel config. | 729 | n must be a power of two. The default size |
730 | is set in the kernel config file. | ||
718 | 731 | ||
719 | lp=0 [LP] Specify parallel ports to use, e.g, | 732 | lp=0 [LP] Specify parallel ports to use, e.g, |
720 | lp=port[,port...] lp=none,parport0 (lp0 not configured, lp1 uses | 733 | lp=port[,port...] lp=none,parport0 (lp0 not configured, lp1 uses |
@@ -750,23 +763,23 @@ running once the system is up. | |||
750 | ltpc= [NET] | 763 | ltpc= [NET] |
751 | Format: <io>,<irq>,<dma> | 764 | Format: <io>,<irq>,<dma> |
752 | 765 | ||
753 | mac5380= [HW,SCSI] | 766 | mac5380= [HW,SCSI] Format: |
754 | Format: <can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags> | 767 | <can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags> |
755 | 768 | ||
756 | mac53c9x= [HW,SCSI] | 769 | mac53c9x= [HW,SCSI] Format: |
757 | Format: <num_esps>,<disconnect>,<nosync>,<can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags> | 770 | <num_esps>,<disconnect>,<nosync>,<can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags> |
758 | 771 | ||
759 | machvec= [IA64] | 772 | machvec= [IA64] Force the use of a particular machine-vector |
760 | Force the use of a particular machine-vector (machvec) in a generic | 773 | (machvec) in a generic kernel. |
761 | kernel. Example: machvec=hpzx1_swiotlb | 774 | Example: machvec=hpzx1_swiotlb |
762 | 775 | ||
763 | mad16= [HW,OSS] | 776 | mad16= [HW,OSS] Format: |
764 | Format: <io>,<irq>,<dma>,<dma16>,<mpu_io>,<mpu_irq>,<joystick> | 777 | <io>,<irq>,<dma>,<dma16>,<mpu_io>,<mpu_irq>,<joystick> |
765 | 778 | ||
766 | maui= [HW,OSS] | 779 | maui= [HW,OSS] |
767 | Format: <io>,<irq> | 780 | Format: <io>,<irq> |
768 | 781 | ||
769 | max_loop= [LOOP] Maximum number of loopback devices that can | 782 | max_loop= [LOOP] Maximum number of loopback devices that can |
770 | be mounted | 783 | be mounted |
771 | Format: <1-256> | 784 | Format: <1-256> |
772 | 785 | ||
@@ -776,11 +789,11 @@ running once the system is up. | |||
776 | max_addr=[KMG] [KNL,BOOT,ia64] All physical memory greater than or | 789 | max_addr=[KMG] [KNL,BOOT,ia64] All physical memory greater than or |
777 | equal to this physical address is ignored. | 790 | equal to this physical address is ignored. |
778 | 791 | ||
779 | max_luns= [SCSI] Maximum number of LUNs to probe | 792 | max_luns= [SCSI] Maximum number of LUNs to probe. |
780 | Should be between 1 and 2^32-1. | 793 | Should be between 1 and 2^32-1. |
781 | 794 | ||
782 | max_report_luns= | 795 | max_report_luns= |
783 | [SCSI] Maximum number of LUNs received | 796 | [SCSI] Maximum number of LUNs received. |
784 | Should be between 1 and 16384. | 797 | Should be between 1 and 16384. |
785 | 798 | ||
786 | mca-pentium [BUGS=IA-32] | 799 | mca-pentium [BUGS=IA-32] |
@@ -796,11 +809,11 @@ running once the system is up. | |||
796 | 809 | ||
797 | md= [HW] RAID subsystems devices and level | 810 | md= [HW] RAID subsystems devices and level |
798 | See Documentation/md.txt. | 811 | See Documentation/md.txt. |
799 | 812 | ||
800 | mdacon= [MDA] | 813 | mdacon= [MDA] |
801 | Format: <first>,<last> | 814 | Format: <first>,<last> |
802 | Specifies range of consoles to be captured by the MDA. | 815 | Specifies range of consoles to be captured by the MDA. |
803 | 816 | ||
804 | mem=nn[KMG] [KNL,BOOT] Force usage of a specific amount of memory | 817 | mem=nn[KMG] [KNL,BOOT] Force usage of a specific amount of memory |
805 | Amount of memory to be used when the kernel is not able | 818 | Amount of memory to be used when the kernel is not able |
806 | to see the whole system memory or for test. | 819 | to see the whole system memory or for test. |
@@ -851,15 +864,15 @@ running once the system is up. | |||
851 | MTD_Partition= [MTD] | 864 | MTD_Partition= [MTD] |
852 | Format: <name>,<region-number>,<size>,<offset> | 865 | Format: <name>,<region-number>,<size>,<offset> |
853 | 866 | ||
854 | MTD_Region= [MTD] | 867 | MTD_Region= [MTD] Format: |
855 | Format: <name>,<region-number>[,<base>,<size>,<buswidth>,<altbuswidth>] | 868 | <name>,<region-number>[,<base>,<size>,<buswidth>,<altbuswidth>] |
856 | 869 | ||
857 | mtdparts= [MTD] | 870 | mtdparts= [MTD] |
858 | See drivers/mtd/cmdline.c. | 871 | See drivers/mtd/cmdline.c. |
859 | 872 | ||
860 | mtouchusb.raw_coordinates= | 873 | mtouchusb.raw_coordinates= |
861 | [HW] Make the MicroTouch USB driver use raw coordinates ('y', default) | 874 | [HW] Make the MicroTouch USB driver use raw coordinates |
862 | or cooked coordinates ('n') | 875 | ('y', default) or cooked coordinates ('n') |
863 | 876 | ||
864 | n2= [NET] SDL Inc. RISCom/N2 synchronous serial card | 877 | n2= [NET] SDL Inc. RISCom/N2 synchronous serial card |
865 | 878 | ||
@@ -880,7 +893,9 @@ running once the system is up. | |||
880 | Format: <irq>,<io>,<mem_start>,<mem_end>,<name> | 893 | Format: <irq>,<io>,<mem_start>,<mem_end>,<name> |
881 | Note that mem_start is often overloaded to mean | 894 | Note that mem_start is often overloaded to mean |
882 | something different and driver-specific. | 895 | something different and driver-specific. |
883 | 896 | This usage is only documented in each driver source | |
897 | file if at all. | ||
898 | |||
884 | nfsaddrs= [NFS] | 899 | nfsaddrs= [NFS] |
885 | See Documentation/nfsroot.txt. | 900 | See Documentation/nfsroot.txt. |
886 | 901 | ||
@@ -893,8 +908,8 @@ running once the system is up. | |||
893 | emulation library even if a 387 maths coprocessor | 908 | emulation library even if a 387 maths coprocessor |
894 | is present. | 909 | is present. |
895 | 910 | ||
896 | noalign [KNL,ARM] | 911 | noalign [KNL,ARM] |
897 | 912 | ||
898 | noapic [SMP,APIC] Tells the kernel to not make use of any | 913 | noapic [SMP,APIC] Tells the kernel to not make use of any |
899 | IOAPICs that may be present in the system. | 914 | IOAPICs that may be present in the system. |
900 | 915 | ||
@@ -905,19 +920,19 @@ running once the system is up. | |||
905 | on "Classic" PPC cores. | 920 | on "Classic" PPC cores. |
906 | 921 | ||
907 | nocache [ARM] | 922 | nocache [ARM] |
908 | 923 | ||
909 | nodisconnect [HW,SCSI,M68K] Disables SCSI disconnects. | 924 | nodisconnect [HW,SCSI,M68K] Disables SCSI disconnects. |
910 | 925 | ||
911 | noexec [IA-64] | 926 | noexec [IA-64] |
912 | 927 | ||
913 | noexec [IA-32, X86-64] | 928 | noexec [IA-32,X86-64] |
914 | noexec=on: enable non-executable mappings (default) | 929 | noexec=on: enable non-executable mappings (default) |
915 | noexec=off: disable nn-executable mappings | 930 | noexec=off: disable nn-executable mappings |
916 | 931 | ||
917 | nofxsr [BUGS=IA-32] | 932 | nofxsr [BUGS=IA-32] |
918 | 933 | ||
919 | nohlt [BUGS=ARM] | 934 | nohlt [BUGS=ARM] |
920 | 935 | ||
921 | no-hlt [BUGS=IA-32] Tells the kernel that the hlt | 936 | no-hlt [BUGS=IA-32] Tells the kernel that the hlt |
922 | instruction doesn't work correctly and not to | 937 | instruction doesn't work correctly and not to |
923 | use it. | 938 | use it. |
@@ -948,8 +963,9 @@ running once the system is up. | |||
948 | 963 | ||
949 | noresidual [PPC] Don't use residual data on PReP machines. | 964 | noresidual [PPC] Don't use residual data on PReP machines. |
950 | 965 | ||
951 | noresume [SWSUSP] Disables resume and restore original swap space. | 966 | noresume [SWSUSP] Disables resume and restores original swap |
952 | 967 | space. | |
968 | |||
953 | no-scroll [VGA] Disables scrollback. | 969 | no-scroll [VGA] Disables scrollback. |
954 | This is required for the Braillex ib80-piezo Braille | 970 | This is required for the Braillex ib80-piezo Braille |
955 | reader made by F.H. Papenmeier (Germany). | 971 | reader made by F.H. Papenmeier (Germany). |
@@ -965,16 +981,16 @@ running once the system is up. | |||
965 | nousb [USB] Disable the USB subsystem | 981 | nousb [USB] Disable the USB subsystem |
966 | 982 | ||
967 | nowb [ARM] | 983 | nowb [ARM] |
968 | 984 | ||
969 | opl3= [HW,OSS] | 985 | opl3= [HW,OSS] |
970 | Format: <io> | 986 | Format: <io> |
971 | 987 | ||
972 | opl3sa= [HW,OSS] | 988 | opl3sa= [HW,OSS] |
973 | Format: <io>,<irq>,<dma>,<dma2>,<mpu_io>,<mpu_irq> | 989 | Format: <io>,<irq>,<dma>,<dma2>,<mpu_io>,<mpu_irq> |
974 | 990 | ||
975 | opl3sa2= [HW,OSS] | 991 | opl3sa2= [HW,OSS] Format: |
976 | Format: <io>,<irq>,<dma>,<dma2>,<mss_io>,<mpu_io>,<ymode>,<loopback>[,<isapnp>,<multiple] | 992 | <io>,<irq>,<dma>,<dma2>,<mss_io>,<mpu_io>,<ymode>,<loopback>[,<isapnp>,<multiple] |
977 | 993 | ||
978 | oprofile.timer= [HW] | 994 | oprofile.timer= [HW] |
979 | Use timer interrupt instead of performance counters | 995 | Use timer interrupt instead of performance counters |
980 | 996 | ||
@@ -993,36 +1009,33 @@ running once the system is up. | |||
993 | Format: <parport#> | 1009 | Format: <parport#> |
994 | parkbd.mode= [HW] Parallel port keyboard adapter mode of operation, | 1010 | parkbd.mode= [HW] Parallel port keyboard adapter mode of operation, |
995 | 0 for XT, 1 for AT (default is AT). | 1011 | 0 for XT, 1 for AT (default is AT). |
996 | Format: <mode> | 1012 | Format: <mode> |
997 | 1013 | ||
998 | parport=0 [HW,PPT] Specify parallel ports. 0 disables. | 1014 | parport= [HW,PPT] Specify parallel ports. 0 disables. |
999 | parport=auto Use 'auto' to force the driver to use | 1015 | Format: { 0 | auto | 0xBBB[,IRQ[,DMA]] } |
1000 | parport=0xBBB[,IRQ[,DMA]] any IRQ/DMA settings detected (the | 1016 | Use 'auto' to force the driver to use any |
1001 | default is to ignore detected IRQ/DMA | 1017 | IRQ/DMA settings detected (the default is to |
1002 | settings because of possible | 1018 | ignore detected IRQ/DMA settings because of |
1003 | conflicts). You can specify the base | 1019 | possible conflicts). You can specify the base |
1004 | address, IRQ, and DMA settings; IRQ and | 1020 | address, IRQ, and DMA settings; IRQ and DMA |
1005 | DMA should be numbers, or 'auto' (for | 1021 | should be numbers, or 'auto' (for using detected |
1006 | using detected settings on that | 1022 | settings on that particular port), or 'nofifo' |
1007 | particular port), or 'nofifo' (to avoid | 1023 | (to avoid using a FIFO even if it is detected). |
1008 | using a FIFO even if it is detected). | 1024 | Parallel ports are assigned in the order they |
1009 | Parallel ports are assigned in the | 1025 | are specified on the command line, starting |
1010 | order they are specified on the command | 1026 | with parport0. |
1011 | line, starting with parport0. | 1027 | |
1012 | 1028 | parport_init_mode= [HW,PPT] | |
1013 | parport_init_mode= | 1029 | Configure VIA parallel port to operate in |
1014 | [HW,PPT] Configure VIA parallel port to | 1030 | a specific mode. This is necessary on Pegasos |
1015 | operate in specific mode. This is | 1031 | computer where firmware has no options for setting |
1016 | necessary on Pegasos computer where | 1032 | up parallel port mode and sets it to spp. |
1017 | firmware has no options for setting up | 1033 | Currently this function knows 686a and 8231 chips. |
1018 | parallel port mode and sets it to | ||
1019 | spp. Currently this function knows | ||
1020 | 686a and 8231 chips. | ||
1021 | Format: [spp|ps2|epp|ecp|ecpepp] | 1034 | Format: [spp|ps2|epp|ecp|ecpepp] |
1022 | 1035 | ||
1023 | pas2= [HW,OSS] | 1036 | pas2= [HW,OSS] Format: |
1024 | Format: <io>,<irq>,<dma>,<dma16>,<sb_io>,<sb_irq>,<sb_dma>,<sb_dma16> | 1037 | <io>,<irq>,<dma>,<dma16>,<sb_io>,<sb_irq>,<sb_dma>,<sb_dma16> |
1025 | 1038 | ||
1026 | pas16= [HW,SCSI] | 1039 | pas16= [HW,SCSI] |
1027 | See header of drivers/scsi/pas16.c. | 1040 | See header of drivers/scsi/pas16.c. |
1028 | 1041 | ||
@@ -1032,64 +1045,67 @@ running once the system is up. | |||
1032 | See header of drivers/block/paride/pcd.c. | 1045 | See header of drivers/block/paride/pcd.c. |
1033 | See also Documentation/paride.txt. | 1046 | See also Documentation/paride.txt. |
1034 | 1047 | ||
1035 | pci=option[,option...] [PCI] various PCI subsystem options: | 1048 | pci=option[,option...] [PCI] various PCI subsystem options: |
1036 | off [IA-32] don't probe for the PCI bus | 1049 | off [IA-32] don't probe for the PCI bus |
1037 | bios [IA-32] force use of PCI BIOS, don't access | 1050 | bios [IA-32] force use of PCI BIOS, don't access |
1038 | the hardware directly. Use this if your machine | 1051 | the hardware directly. Use this if your machine |
1039 | has a non-standard PCI host bridge. | 1052 | has a non-standard PCI host bridge. |
1040 | nobios [IA-32] disallow use of PCI BIOS, only direct | 1053 | nobios [IA-32] disallow use of PCI BIOS, only direct |
1041 | hardware access methods are allowed. Use this | 1054 | hardware access methods are allowed. Use this |
1042 | if you experience crashes upon bootup and you | 1055 | if you experience crashes upon bootup and you |
1043 | suspect they are caused by the BIOS. | 1056 | suspect they are caused by the BIOS. |
1044 | conf1 [IA-32] Force use of PCI Configuration Mechanism 1. | 1057 | conf1 [IA-32] Force use of PCI Configuration |
1045 | conf2 [IA-32] Force use of PCI Configuration Mechanism 2. | 1058 | Mechanism 1. |
1046 | nosort [IA-32] Don't sort PCI devices according to | 1059 | conf2 [IA-32] Force use of PCI Configuration |
1047 | order given by the PCI BIOS. This sorting is done | 1060 | Mechanism 2. |
1048 | to get a device order compatible with older kernels. | 1061 | nosort [IA-32] Don't sort PCI devices according to |
1049 | biosirq [IA-32] Use PCI BIOS calls to get the interrupt | 1062 | order given by the PCI BIOS. This sorting is |
1050 | routing table. These calls are known to be buggy | 1063 | done to get a device order compatible with |
1051 | on several machines and they hang the machine when used, | 1064 | older kernels. |
1052 | but on other computers it's the only way to get the | 1065 | biosirq [IA-32] Use PCI BIOS calls to get the interrupt |
1053 | interrupt routing table. Try this option if the kernel | 1066 | routing table. These calls are known to be buggy |
1054 | is unable to allocate IRQs or discover secondary PCI | 1067 | on several machines and they hang the machine |
1055 | buses on your motherboard. | 1068 | when used, but on other computers it's the only |
1056 | rom [IA-32] Assign address space to expansion ROMs. | 1069 | way to get the interrupt routing table. Try |
1057 | Use with caution as certain devices share address | 1070 | this option if the kernel is unable to allocate |
1058 | decoders between ROMs and other resources. | 1071 | IRQs or discover secondary PCI buses on your |
1059 | irqmask=0xMMMM [IA-32] Set a bit mask of IRQs allowed to be assigned | 1072 | motherboard. |
1060 | automatically to PCI devices. You can make the kernel | 1073 | rom [IA-32] Assign address space to expansion ROMs. |
1061 | exclude IRQs of your ISA cards this way. | 1074 | Use with caution as certain devices share |
1075 | address decoders between ROMs and other | ||
1076 | resources. | ||
1077 | irqmask=0xMMMM [IA-32] Set a bit mask of IRQs allowed to be | ||
1078 | assigned automatically to PCI devices. You can | ||
1079 | make the kernel exclude IRQs of your ISA cards | ||
1080 | this way. | ||
1062 | pirqaddr=0xAAAAA [IA-32] Specify the physical address | 1081 | pirqaddr=0xAAAAA [IA-32] Specify the physical address |
1063 | of the PIRQ table (normally generated | 1082 | of the PIRQ table (normally generated |
1064 | by the BIOS) if it is outside the | 1083 | by the BIOS) if it is outside the |
1065 | F0000h-100000h range. | 1084 | F0000h-100000h range. |
1066 | lastbus=N [IA-32] Scan all buses till bus #N. Can be useful | 1085 | lastbus=N [IA-32] Scan all buses thru bus #N. Can be |
1067 | if the kernel is unable to find your secondary buses | 1086 | useful if the kernel is unable to find your |
1068 | and you want to tell it explicitly which ones they are. | 1087 | secondary buses and you want to tell it |
1069 | assign-busses [IA-32] Always assign all PCI bus | 1088 | explicitly which ones they are. |
1070 | numbers ourselves, overriding | 1089 | assign-busses [IA-32] Always assign all PCI bus |
1071 | whatever the firmware may have | 1090 | numbers ourselves, overriding |
1072 | done. | 1091 | whatever the firmware may have done. |
1073 | usepirqmask [IA-32] Honor the possible IRQ mask | 1092 | usepirqmask [IA-32] Honor the possible IRQ mask stored |
1074 | stored in the BIOS $PIR table. This is | 1093 | in the BIOS $PIR table. This is needed on |
1075 | needed on some systems with broken | 1094 | some systems with broken BIOSes, notably |
1076 | BIOSes, notably some HP Pavilion N5400 | 1095 | some HP Pavilion N5400 and Omnibook XE3 |
1077 | and Omnibook XE3 notebooks. This will | 1096 | notebooks. This will have no effect if ACPI |
1078 | have no effect if ACPI IRQ routing is | 1097 | IRQ routing is enabled. |
1079 | enabled. | 1098 | noacpi [IA-32] Do not use ACPI for IRQ routing |
1080 | noacpi [IA-32] Do not use ACPI for IRQ routing | 1099 | or for PCI scanning. |
1081 | or for PCI scanning. | 1100 | routeirq Do IRQ routing for all PCI devices. |
1082 | routeirq Do IRQ routing for all PCI devices. | 1101 | This is normally done in pci_enable_device(), |
1083 | This is normally done in pci_enable_device(), | 1102 | so this option is a temporary workaround |
1084 | so this option is a temporary workaround | 1103 | for broken drivers that don't call it. |
1085 | for broken drivers that don't call it. | 1104 | firmware [ARM] Do not re-enumerate the bus but instead |
1086 | 1105 | just use the configuration from the | |
1087 | firmware [ARM] Do not re-enumerate the bus but | 1106 | bootloader. This is currently used on |
1088 | instead just use the configuration | 1107 | IXP2000 systems where the bus has to be |
1089 | from the bootloader. This is currently | 1108 | configured a certain way for adjunct CPUs. |
1090 | used on IXP2000 systems where the | ||
1091 | bus has to be configured a certain way | ||
1092 | for adjunct CPUs. | ||
1093 | 1109 | ||
1094 | pcmv= [HW,PCMCIA] BadgePAD 4 | 1110 | pcmv= [HW,PCMCIA] BadgePAD 4 |
1095 | 1111 | ||
@@ -1127,19 +1143,20 @@ running once the system is up. | |||
1127 | [ISAPNP] Exclude DMAs for the autoconfiguration | 1143 | [ISAPNP] Exclude DMAs for the autoconfiguration |
1128 | 1144 | ||
1129 | pnp_reserve_io= [ISAPNP] Exclude I/O ports for the autoconfiguration | 1145 | pnp_reserve_io= [ISAPNP] Exclude I/O ports for the autoconfiguration |
1130 | Ranges are in pairs (I/O port base and size). | 1146 | Ranges are in pairs (I/O port base and size). |
1131 | 1147 | ||
1132 | pnp_reserve_mem= | 1148 | pnp_reserve_mem= |
1133 | [ISAPNP] Exclude memory regions for the autoconfiguration | 1149 | [ISAPNP] Exclude memory regions for the |
1150 | autoconfiguration. | ||
1134 | Ranges are in pairs (memory base and size). | 1151 | Ranges are in pairs (memory base and size). |
1135 | 1152 | ||
1136 | profile= [KNL] Enable kernel profiling via /proc/profile | 1153 | profile= [KNL] Enable kernel profiling via /proc/profile |
1137 | { schedule | <number> } | 1154 | Format: [schedule,]<number> |
1138 | (param: schedule - profile schedule points} | 1155 | Param: "schedule" - profile schedule points. |
1139 | (param: profile step/bucket size as a power of 2 for | 1156 | Param: <number> - step/bucket size as a power of 2 for |
1140 | statistical time based profiling) | 1157 | statistical time based profiling. |
1141 | 1158 | ||
1142 | processor.max_cstate= [HW, ACPI] | 1159 | processor.max_cstate= [HW,ACPI] |
1143 | Limit processor to maximum C-state | 1160 | Limit processor to maximum C-state |
1144 | max_cstate=9 overrides any DMI blacklist limit. | 1161 | max_cstate=9 overrides any DMI blacklist limit. |
1145 | 1162 | ||
@@ -1147,27 +1164,28 @@ running once the system is up. | |||
1147 | before loading. | 1164 | before loading. |
1148 | See Documentation/ramdisk.txt. | 1165 | See Documentation/ramdisk.txt. |
1149 | 1166 | ||
1150 | psmouse.proto= [HW,MOUSE] Highest PS2 mouse protocol extension to | 1167 | psmouse.proto= [HW,MOUSE] Highest PS2 mouse protocol extension to |
1151 | probe for (bare|imps|exps|lifebook|any). | 1168 | probe for; one of (bare|imps|exps|lifebook|any). |
1152 | psmouse.rate= [HW,MOUSE] Set desired mouse report rate, in reports | 1169 | psmouse.rate= [HW,MOUSE] Set desired mouse report rate, in reports |
1153 | per second. | 1170 | per second. |
1154 | psmouse.resetafter= | 1171 | psmouse.resetafter= [HW,MOUSE] |
1155 | [HW,MOUSE] Try to reset the device after so many bad packets | 1172 | Try to reset the device after so many bad packets |
1156 | (0 = never). | 1173 | (0 = never). |
1157 | psmouse.resolution= | 1174 | psmouse.resolution= |
1158 | [HW,MOUSE] Set desired mouse resolution, in dpi. | 1175 | [HW,MOUSE] Set desired mouse resolution, in dpi. |
1159 | psmouse.smartscroll= | 1176 | psmouse.smartscroll= |
1160 | [HW,MOUSE] Controls Logitech smartscroll autorepeat, | 1177 | [HW,MOUSE] Controls Logitech smartscroll autorepeat. |
1161 | 0 = disabled, 1 = enabled (default). | 1178 | 0 = disabled, 1 = enabled (default). |
1162 | 1179 | ||
1163 | pss= [HW,OSS] Personal Sound System (ECHO ESC614) | 1180 | pss= [HW,OSS] Personal Sound System (ECHO ESC614) |
1164 | Format: <io>,<mss_io>,<mss_irq>,<mss_dma>,<mpu_io>,<mpu_irq> | 1181 | Format: |
1182 | <io>,<mss_io>,<mss_irq>,<mss_dma>,<mpu_io>,<mpu_irq> | ||
1165 | 1183 | ||
1166 | pt. [PARIDE] | 1184 | pt. [PARIDE] |
1167 | See Documentation/paride.txt. | 1185 | See Documentation/paride.txt. |
1168 | 1186 | ||
1169 | quiet= [KNL] Disable log messages | 1187 | quiet= [KNL] Disable log messages |
1170 | 1188 | ||
1171 | r128= [HW,DRM] | 1189 | r128= [HW,DRM] |
1172 | 1190 | ||
1173 | raid= [HW,RAID] | 1191 | raid= [HW,RAID] |
@@ -1176,10 +1194,9 @@ running once the system is up. | |||
1176 | ramdisk= [RAM] Sizes of RAM disks in kilobytes [deprecated] | 1194 | ramdisk= [RAM] Sizes of RAM disks in kilobytes [deprecated] |
1177 | See Documentation/ramdisk.txt. | 1195 | See Documentation/ramdisk.txt. |
1178 | 1196 | ||
1179 | ramdisk_blocksize= | 1197 | ramdisk_blocksize= [RAM] |
1180 | [RAM] | ||
1181 | See Documentation/ramdisk.txt. | 1198 | See Documentation/ramdisk.txt. |
1182 | 1199 | ||
1183 | ramdisk_size= [RAM] Sizes of RAM disks in kilobytes | 1200 | ramdisk_size= [RAM] Sizes of RAM disks in kilobytes |
1184 | New name for the ramdisk parameter. | 1201 | New name for the ramdisk parameter. |
1185 | See Documentation/ramdisk.txt. | 1202 | See Documentation/ramdisk.txt. |
@@ -1195,7 +1212,8 @@ running once the system is up. | |||
1195 | 1212 | ||
1196 | reserve= [KNL,BUGS] Force the kernel to ignore some iomem area | 1213 | reserve= [KNL,BUGS] Force the kernel to ignore some iomem area |
1197 | 1214 | ||
1198 | resume= [SWSUSP] Specify the partition device for software suspension | 1215 | resume= [SWSUSP] |
1216 | Specify the partition device for software suspend | ||
1199 | 1217 | ||
1200 | rhash_entries= [KNL,NET] | 1218 | rhash_entries= [KNL,NET] |
1201 | Set number of hash buckets for route cache | 1219 | Set number of hash buckets for route cache |
@@ -1225,7 +1243,7 @@ running once the system is up. | |||
1225 | Format: <io>,<irq>,<dma>,<dma2> | 1243 | Format: <io>,<irq>,<dma>,<dma2> |
1226 | 1244 | ||
1227 | sbni= [NET] Granch SBNI12 leased line adapter | 1245 | sbni= [NET] Granch SBNI12 leased line adapter |
1228 | 1246 | ||
1229 | sbpcd= [HW,CD] Soundblaster CD adapter | 1247 | sbpcd= [HW,CD] Soundblaster CD adapter |
1230 | Format: <io>,<type> | 1248 | Format: <io>,<type> |
1231 | See a comment before function sbpcd_setup() in | 1249 | See a comment before function sbpcd_setup() in |
@@ -1258,21 +1276,20 @@ running once the system is up. | |||
1258 | 1276 | ||
1259 | serialnumber [BUGS=IA-32] | 1277 | serialnumber [BUGS=IA-32] |
1260 | 1278 | ||
1261 | sg_def_reserved_size= | 1279 | sg_def_reserved_size= [SCSI] |
1262 | [SCSI] | 1280 | |
1263 | |||
1264 | sgalaxy= [HW,OSS] | 1281 | sgalaxy= [HW,OSS] |
1265 | Format: <io>,<irq>,<dma>,<dma2>,<sgbase> | 1282 | Format: <io>,<irq>,<dma>,<dma2>,<sgbase> |
1266 | 1283 | ||
1267 | shapers= [NET] | 1284 | shapers= [NET] |
1268 | Maximal number of shapers. | 1285 | Maximal number of shapers. |
1269 | 1286 | ||
1270 | sim710= [SCSI,HW] | 1287 | sim710= [SCSI,HW] |
1271 | See header of drivers/scsi/sim710.c. | 1288 | See header of drivers/scsi/sim710.c. |
1272 | 1289 | ||
1273 | simeth= [IA-64] | 1290 | simeth= [IA-64] |
1274 | simscsi= | 1291 | simscsi= |
1275 | 1292 | ||
1276 | sjcd= [HW,CD] | 1293 | sjcd= [HW,CD] |
1277 | Format: <io>,<irq>,<dma> | 1294 | Format: <io>,<irq>,<dma> |
1278 | See header of drivers/cdrom/sjcd.c. | 1295 | See header of drivers/cdrom/sjcd.c. |
@@ -1403,10 +1420,10 @@ running once the system is up. | |||
1403 | snd-wavefront= [HW,ALSA] | 1420 | snd-wavefront= [HW,ALSA] |
1404 | 1421 | ||
1405 | snd-ymfpci= [HW,ALSA] | 1422 | snd-ymfpci= [HW,ALSA] |
1406 | 1423 | ||
1407 | sonicvibes= [HW,OSS] | 1424 | sonicvibes= [HW,OSS] |
1408 | Format: <reverb> | 1425 | Format: <reverb> |
1409 | 1426 | ||
1410 | sonycd535= [HW,CD] | 1427 | sonycd535= [HW,CD] |
1411 | Format: <io>[,<irq>] | 1428 | Format: <io>[,<irq>] |
1412 | 1429 | ||
@@ -1423,7 +1440,7 @@ running once the system is up. | |||
1423 | 1440 | ||
1424 | sscape= [HW,OSS] | 1441 | sscape= [HW,OSS] |
1425 | Format: <io>,<irq>,<dma>,<mpu_io>,<mpu_irq> | 1442 | Format: <io>,<irq>,<dma>,<mpu_io>,<mpu_irq> |
1426 | 1443 | ||
1427 | st= [HW,SCSI] SCSI tape parameters (buffers, etc.) | 1444 | st= [HW,SCSI] SCSI tape parameters (buffers, etc.) |
1428 | See Documentation/scsi/st.txt. | 1445 | See Documentation/scsi/st.txt. |
1429 | 1446 | ||
@@ -1446,7 +1463,7 @@ running once the system is up. | |||
1446 | stram_swap= [HW,M68k] | 1463 | stram_swap= [HW,M68k] |
1447 | 1464 | ||
1448 | swiotlb= [IA-64] Number of I/O TLB slabs | 1465 | swiotlb= [IA-64] Number of I/O TLB slabs |
1449 | 1466 | ||
1450 | switches= [HW,M68k] | 1467 | switches= [HW,M68k] |
1451 | 1468 | ||
1452 | sym53c416= [HW,SCSI] | 1469 | sym53c416= [HW,SCSI] |
@@ -1479,14 +1496,16 @@ running once the system is up. | |||
1479 | tp720= [HW,PS2] | 1496 | tp720= [HW,PS2] |
1480 | 1497 | ||
1481 | trix= [HW,OSS] MediaTrix AudioTrix Pro | 1498 | trix= [HW,OSS] MediaTrix AudioTrix Pro |
1482 | Format: <io>,<irq>,<dma>,<dma2>,<sb_io>,<sb_irq>,<sb_dma>,<mpu_io>,<mpu_irq> | 1499 | Format: |
1483 | 1500 | <io>,<irq>,<dma>,<dma2>,<sb_io>,<sb_irq>,<sb_dma>,<mpu_io>,<mpu_irq> | |
1501 | |||
1484 | tsdev.xres= [TS] Horizontal screen resolution. | 1502 | tsdev.xres= [TS] Horizontal screen resolution. |
1485 | tsdev.yres= [TS] Vertical screen resolution. | 1503 | tsdev.yres= [TS] Vertical screen resolution. |
1486 | 1504 | ||
1487 | turbografx.map[2|3]= | 1505 | turbografx.map[2|3]= [HW,JOY] |
1488 | [HW,JOY] TurboGraFX parallel port interface | 1506 | TurboGraFX parallel port interface |
1489 | Format: <port#>,<js1>,<js2>,<js3>,<js4>,<js5>,<js6>,<js7> | 1507 | Format: |
1508 | <port#>,<js1>,<js2>,<js3>,<js4>,<js5>,<js6>,<js7> | ||
1490 | See also Documentation/input/joystick-parport.txt | 1509 | See also Documentation/input/joystick-parport.txt |
1491 | 1510 | ||
1492 | u14-34f= [HW,SCSI] UltraStor 14F/34F SCSI host adapter | 1511 | u14-34f= [HW,SCSI] UltraStor 14F/34F SCSI host adapter |
@@ -1502,17 +1521,18 @@ running once the system is up. | |||
1502 | 1521 | ||
1503 | usbhid.mousepoll= | 1522 | usbhid.mousepoll= |
1504 | [USBHID] The interval which mice are to be polled at. | 1523 | [USBHID] The interval which mice are to be polled at. |
1505 | 1524 | ||
1506 | video= [FB] Frame buffer configuration | 1525 | video= [FB] Frame buffer configuration |
1507 | See Documentation/fb/modedb.txt. | 1526 | See Documentation/fb/modedb.txt. |
1508 | 1527 | ||
1509 | vga= [BOOT,IA-32] Select a particular video mode | 1528 | vga= [BOOT,IA-32] Select a particular video mode |
1510 | See Documentation/i386/boot.txt and Documentation/svga.txt. | 1529 | See Documentation/i386/boot.txt and |
1530 | Documentation/svga.txt. | ||
1511 | Use vga=ask for menu. | 1531 | Use vga=ask for menu. |
1512 | This is actually a boot loader parameter; the value is | 1532 | This is actually a boot loader parameter; the value is |
1513 | passed to the kernel using a special protocol. | 1533 | passed to the kernel using a special protocol. |
1514 | 1534 | ||
1515 | vmalloc=nn[KMG] [KNL,BOOT] forces the vmalloc area to have an exact | 1535 | vmalloc=nn[KMG] [KNL,BOOT] Forces the vmalloc area to have an exact |
1516 | size of <nn>. This can be used to increase the | 1536 | size of <nn>. This can be used to increase the |
1517 | minimum size (128MB on x86). It can also be used to | 1537 | minimum size (128MB on x86). It can also be used to |
1518 | decrease the size and leave more room for directly | 1538 | decrease the size and leave more room for directly |
@@ -1520,11 +1540,11 @@ running once the system is up. | |||
1520 | 1540 | ||
1521 | vmhalt= [KNL,S390] | 1541 | vmhalt= [KNL,S390] |
1522 | 1542 | ||
1523 | vmpoff= [KNL,S390] | 1543 | vmpoff= [KNL,S390] |
1524 | 1544 | ||
1525 | waveartist= [HW,OSS] | 1545 | waveartist= [HW,OSS] |
1526 | Format: <io>,<irq>,<dma>,<dma2> | 1546 | Format: <io>,<irq>,<dma>,<dma2> |
1527 | 1547 | ||
1528 | wd33c93= [HW,SCSI] | 1548 | wd33c93= [HW,SCSI] |
1529 | See header of drivers/scsi/wd33c93.c. | 1549 | See header of drivers/scsi/wd33c93.c. |
1530 | 1550 | ||
@@ -1538,21 +1558,25 @@ running once the system is up. | |||
1538 | xd_geo= See header of drivers/block/xd.c. | 1558 | xd_geo= See header of drivers/block/xd.c. |
1539 | 1559 | ||
1540 | xirc2ps_cs= [NET,PCMCIA] | 1560 | xirc2ps_cs= [NET,PCMCIA] |
1541 | Format: <irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]] | 1561 | Format: |
1542 | 1562 | <irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]] | |
1543 | 1563 | ||
1544 | 1564 | ||
1565 | ______________________________________________________________________ | ||
1545 | Changelog: | 1566 | Changelog: |
1546 | 1567 | ||
1568 | 2000-06-?? Mr. Unknown | ||
1547 | The last known update (for 2.4.0) - the changelog was not kept before. | 1569 | The last known update (for 2.4.0) - the changelog was not kept before. |
1548 | 2000-06-?? Mr. Unknown | ||
1549 | 1570 | ||
1571 | 2002-11-24 Petr Baudis <pasky@ucw.cz> | ||
1572 | Randy Dunlap <randy.dunlap@verizon.net> | ||
1550 | Update for 2.5.49, description for most of the options introduced, | 1573 | Update for 2.5.49, description for most of the options introduced, |
1551 | references to other documentation (C files, READMEs, ..), added S390, | 1574 | references to other documentation (C files, READMEs, ..), added S390, |
1552 | PPC, SPARC, MTD, ALSA and OSS category. Minor corrections and | 1575 | PPC, SPARC, MTD, ALSA and OSS category. Minor corrections and |
1553 | reformatting. | 1576 | reformatting. |
1554 | 2002-11-24 Petr Baudis <pasky@ucw.cz> | 1577 | |
1555 | Randy Dunlap <randy.dunlap@verizon.net> | 1578 | 2005-10-19 Randy Dunlap <rdunlap@xenotime.net> |
1579 | Lots of typos, whitespace, some reformatting. | ||
1556 | 1580 | ||
1557 | TODO: | 1581 | TODO: |
1558 | 1582 | ||
diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt index a55f0f95b171..b0fe41da007b 100644 --- a/Documentation/networking/bonding.txt +++ b/Documentation/networking/bonding.txt | |||
@@ -777,7 +777,7 @@ doing so is the same as described in the "Configuring Multiple Bonds | |||
777 | Manually" section, below. | 777 | Manually" section, below. |
778 | 778 | ||
779 | NOTE: It has been observed that some Red Hat supplied kernels | 779 | NOTE: It has been observed that some Red Hat supplied kernels |
780 | are apparently unable to rename modules at load time (the "-obonding1" | 780 | are apparently unable to rename modules at load time (the "-o bond1" |
781 | part). Attempts to pass that option to modprobe will produce an | 781 | part). Attempts to pass that option to modprobe will produce an |
782 | "Operation not permitted" error. This has been reported on some | 782 | "Operation not permitted" error. This has been reported on some |
783 | Fedora Core kernels, and has been seen on RHEL 4 as well. On kernels | 783 | Fedora Core kernels, and has been seen on RHEL 4 as well. On kernels |
@@ -883,7 +883,8 @@ the above does not work, and the second bonding instance never sees | |||
883 | its options. In that case, the second options line can be substituted | 883 | its options. In that case, the second options line can be substituted |
884 | as follows: | 884 | as follows: |
885 | 885 | ||
886 | install bonding1 /sbin/modprobe bonding -obond1 mode=balance-alb miimon=50 | 886 | install bond1 /sbin/modprobe --ignore-install bonding -o bond1 \ |
887 | mode=balance-alb miimon=50 | ||
887 | 888 | ||
888 | This may be repeated any number of times, specifying a new and | 889 | This may be repeated any number of times, specifying a new and |
889 | unique name in place of bond1 for each subsequent instance. | 890 | unique name in place of bond1 for each subsequent instance. |