From d89af4d1d601acfc9afc0b7339b36ac0103d6c14 Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Wed, 11 Aug 2010 18:34:09 +0200 Subject: [PATCH] --- yaml --- r: 215995 b: refs/heads/master c: bbff2168c1088995753e889580c756971eca51e4 h: refs/heads/master i: 215993: 11ea54fee5414827b33345a1e7d98da8b5840e15 215991: de1619d8e7bf1c8d4dab5d381a0d022b8f4c4675 v: v3 --- [refs] | 2 +- trunk/Documentation/kernel-parameters.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 374dc5a74802..8326d4bca417 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6396fc3b3ff3f6b942992b653a62df11dcef9bea +refs/heads/master: bbff2168c1088995753e889580c756971eca51e4 diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index d529b1363e95..8ed3a7772da1 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -1777,7 +1777,7 @@ and is between 256 and 4096 characters. It is defined in the file norandmaps Don't use address space randomization. Equivalent to echo 0 > /proc/sys/kernel/randomize_va_space - noreplace-paravirt [X86-32,PV_OPS] Don't patch paravirt_ops + noreplace-paravirt [X86,IA-64,PV_OPS] Don't patch paravirt_ops noreplace-smp [X86-32,SMP] Don't replace SMP instructions with UP alternatives