diff options
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 31 | 
1 files changed, 26 insertions, 5 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 2b2407d9a6d..f72ba727441 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -93,6 +93,7 @@ parameter is applicable:  			Documentation/scsi/.  	SECURITY Different security models are enabled.  	SELINUX SELinux support is enabled. +	APPARMOR AppArmor support is enabled.  	SERIAL	Serial support is enabled.  	SH	SuperH architecture is enabled.  	SMP	The kernel is an SMP kernel. @@ -115,6 +116,7 @@ parameter is applicable:  			More X86-64 boot options can be found in  			Documentation/x86/x86_64/boot-options.txt .  	X86	Either 32bit or 64bit x86 (same as X86-32+X86-64) +	XEN	Xen support is enabled  In addition, the following text indicates that the option: @@ -1143,9 +1145,12 @@ and is between 256 and 4096 characters. It is defined in the file  	kgdboc=		[KGDB,HW] kgdb over consoles.  			Requires a tty driver that supports console polling,  			or a supported polling keyboard driver (non-usb). -			Serial only format: <serial_device>[,baud] -			keyboard only format: kbd -			keyboard and serial format: kbd,<serial_device>[,baud] +			 Serial only format: <serial_device>[,baud] +			 keyboard only format: kbd +			 keyboard and serial format: kbd,<serial_device>[,baud] +			Optional Kernel mode setting: +			 kms, kbd format: kms,kbd +			 kms, kbd and serial format: kms,kbd,<ser_dev>[,baud]  	kgdbwait	[KGDB] Stop kernel execution and enter the  			kernel debugger at the earliest opportunity. @@ -1597,8 +1602,7 @@ and is between 256 and 4096 characters. It is defined in the file  			[NETFILTER] Enable connection tracking flow accounting  			0 to disable accounting  			1 to enable accounting -			Default value depends on CONFIG_NF_CT_ACCT that is -			going to be removed in 2.6.29. +			Default value is 0.  	nfsaddrs=	[NFS]  			See Documentation/filesystems/nfs/nfsroot.txt. @@ -2312,6 +2316,13 @@ 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. +	apparmor=	[APPARMOR] Disable or enable AppArmor at boot time +			Format: { "0" | "1" } +			See security/apparmor/Kconfig help text +			0 -- disable. +			1 -- enable. +			Default value is set via kernel config option. +  	serialnumber	[BUGS=X86-32]  	shapers=	[NET] @@ -2879,6 +2890,16 @@ and is between 256 and 4096 characters. It is defined in the file  	xd=		[HW,XT] Original XT pre-IDE (RLL encoded) disks.  	xd_geo=		See header of drivers/block/xd.c. +	xen_emul_unplug=		[HW,X86,XEN] +			Unplug Xen emulated devices +			Format: [unplug0,][unplug1] +			ide-disks -- unplug primary master IDE devices +			aux-ide-disks -- unplug non-primary-master IDE devices +			nics -- unplug network devices +			all -- unplug all emulated devices (NICs and IDE disks) +			ignore -- continue loading the Xen platform PCI driver even +				if the version check failed +  	xirc2ps_cs=	[NET,PCMCIA]  			Format:  			<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]  |