diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-13 18:51:38 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-13 18:51:38 +1000 |
commit | 29ef22b18ff109207a0aea4e1bbd334c799961de (patch) | |
tree | 8e40d733c8f404208934cbecaff63c75888fc2b3 /Documentation/kernel-parameters.txt | |
parent | db1ca2991a2f3da8ab68d5c644fe0aeea4dafecf (diff) | |
parent | a3c9535ed75f522070b826152c2c2f4f79338d96 (diff) |
Merge commit 'sfi/sfi-test'
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 0e4a295be10c..4d348f667feb 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -93,6 +93,7 @@ parameter is applicable: SECURITY Different security models are enabled. SELINUX SELinux support is enabled. SERIAL Serial support is enabled. + SFI Simple Firmware Interface SH SuperH architecture is enabled. SMP The kernel is an SMP kernel. SPARC Sparc architecture is enabled. @@ -2210,6 +2211,10 @@ and is between 256 and 4096 characters. It is defined in the file If enabled at boot time, /selinux/disable can be used later to disable prior to initial policy load. + sfi= [SFI,X86] Simple Firmware Interface + Format: { "off" } + off -- disable SFI + serialnumber [BUGS=X86-32] shapers= [NET] |