diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 14:27:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 14:27:09 -0700 |
| commit | d25413efa9536e2f425ea45c7720598035c597bc (patch) | |
| tree | 97dcd459a7ec23c9438983fe14a23aef03b09bad /Documentation | |
| parent | 683c5e853ebe2d1ac72128f1828421de7fc3a23c (diff) | |
| parent | f946eeb9313ff1470758e171a60fe7438a2ded3f (diff) | |
| download | linux-d25413efa9536e2f425ea45c7720598035c597bc.tar.gz linux-d25413efa9536e2f425ea45c7720598035c597bc.tar.bz2 linux-d25413efa9536e2f425ea45c7720598035c597bc.zip | |
Merge git://github.com/rustyrussell/linux
Pull module and param updates from Rusty Russell:
"I'm getting married next week, and then honeymoon until 6th May. I'll
be offline from next week, except to post the compulsory pictures if
Alex shaves her head..."
I'm sure Rusty can take time off from his honeymoon if something comes
up. And here's the explanation about head shaving:
http://baldalex.org/
in case you wondered and wanted to support another insane caper or
Rusty's involving shaving.
What *is* it with Rusty and shaving, anyway?
* git://github.com/rustyrussell/linux:
module: Remove module size limit
module: move __module_get and try_module_get() out of line.
params: <level>_initcall-like kernel parameters
module_param: remove support for bool parameters which are really int.
module: add kernel param to force disable module load
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 58eac231fe69..e2f8c297a8a4 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1869,6 +1869,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. shutdown the other cpus. Instead use the REBOOT_VECTOR irq. + nomodule Disable module load + nopat [X86] Disable PAT (page attribute table extension of pagetables) support. |