]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix nmi patch in .32 queue
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 8 Dec 2010 23:11:03 +0000 (15:11 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 8 Dec 2010 23:11:03 +0000 (15:11 -0800)
review-2.6.32/nmi-fix-clock-comparator-revalidation.patch

index e2a14fcd523d9c7a1b75530f3eed336c56f1d5fd..9011c60c54b5784227fe11eb303acf8814a2aaf6 100644 (file)
@@ -28,7 +28,6 @@ expected value.
 In addition the special handling for udelay must be changed as well.
 
 Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
-Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 ---
@@ -56,7 +55,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 -              : "=m" (tmpclock) : "a" (&(tmpclock)) : "cc", "memory");
 -
 +      if (S390_lowcore.clock_comparator == -1)
-+              set_clock_comparator(S390_lowcore.mcck_clock);
++              set_clock_comparator(get_clock());
 +      else
 +              set_clock_comparator(S390_lowcore.clock_comparator);
        /* Check if old PSW is valid */