X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=Documentation%2Fkernel-parameters.txt;h=f08e2bebb1864b44edb733ee96eae30c06cf6ee9;hb=57eee9ae7bbcfb692dc96c739a5184adb6349733;hp=8f9e17c855a010e1171e410743ca9c70900ea041;hpb=62a6f465f6572e1f28765c583c12753bb3e23715;p=deliverable%2Flinux.git

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 8f9e17c855a0..f08e2bebb186 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1577,6 +1577,9 @@ and is between 256 and 4096 characters. It is defined in the file
 	noinitrd	[RAM] Tells the kernel not to load any configured
 			initial RAM disk.
 
+	nointremap	[X86-64, Intel-IOMMU] Do not enable interrupt
+			remapping.
+
 	nointroute	[IA-64]
 
 	nojitter	[IA64] Disables jitter checking for ITC timers.
@@ -1662,6 +1665,14 @@ and is between 256 and 4096 characters. It is defined in the file
 	oprofile.timer=	[HW]
 			Use timer interrupt instead of performance counters
 
+	oprofile.cpu_type=	Force an oprofile cpu type
+			This might be useful if you have an older oprofile
+			userland or if you want common events.
+			Format: { archperfmon }
+			archperfmon: [X86] Force use of architectural
+				perfmon on Intel CPUs instead of the
+				CPU specific event set.
+
 	osst=		[HW,SCSI] SCSI Tape Driver
 			Format: <buffer_size>,<write_threshold>
 			See also Documentation/scsi/st.txt.