[alternative-merged] lockdep-dont-print-lockdep-taint-message-for-lockdep.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     lockdep: don't print lockdep taint message for !LOCKDEP
has been removed from the -mm tree.  Its filename was
     lockdep-dont-print-lockdep-taint-message-for-lockdep.patch

This patch was dropped because an alternative patch was merged

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: lockdep: don't print lockdep taint message for !LOCKDEP
From: Andi Kleen <andi@xxxxxxxxxxxxxx>

I was surprised to see a

Disabling lockdep due to kernel taint

message in my lockdep disabled kernel. This patch ifdefs this message
to not be printed when lockdep is not enabled.

BTW in my case it was due to a thermal event.  I'm not sure it's really
needed to disable lockdep on thermal events, but I left this alone for
now.

Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 kernel/panic.c |    2 ++
 1 file changed, 2 insertions(+)

diff -puN kernel/panic.c~lockdep-dont-print-lockdep-taint-message-for-lockdep kernel/panic.c
--- a/kernel/panic.c~lockdep-dont-print-lockdep-taint-message-for-lockdep
+++ a/kernel/panic.c
@@ -213,6 +213,7 @@ unsigned long get_taint(void)
 
 void add_taint(unsigned flag)
 {
+#ifdef CONFIG_LOCKDEP
 	/*
 	 * Can't trust the integrity of the kernel anymore.
 	 * We don't call directly debug_locks_off() because the issue
@@ -222,6 +223,7 @@ void add_taint(unsigned flag)
 	 */
 	if (flag != TAINT_CRAP && flag != TAINT_WARN && __debug_locks_off())
 		printk(KERN_WARNING "Disabling lockdep due to kernel taint\n");
+#endif
 
 	set_bit(flag, &tainted_mask);
 }
_

Patches currently in -mm which might be from andi@xxxxxxxxxxxxxx are

origin.patch
linux-next.patch
x86-simplify-highmem-related-kconfig-entries.patch
lockdep-dont-print-lockdep-taint-message-for-lockdep.patch
eliminate-thousands-of-warnings-in-warn_on-with-gcc-32-build.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux