+ kconfiginstrumentation-sourcing-missing-on-i386-and-x86_64.patch added to -mm tree

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

 



The patch titled
     Kconfig.instrumentation sourcing missing on i386 and x86_64
has been added to the -mm tree.  Its filename is
     kconfiginstrumentation-sourcing-missing-on-i386-and-x86_64.patch

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: Kconfig.instrumentation sourcing missing on i386 and x86_64
From: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx>

The same happened on i386 and x86_64. I guess some bits from the
combine-instrumentation-menus-in-kernel-kconfiginstrumentation.patch
were lost during the mainline merge.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 arch/i386/Kconfig   |    2 ++
 arch/x86_64/Kconfig |    2 ++
 2 files changed, 4 insertions(+)

diff -puN arch/i386/Kconfig~kconfiginstrumentation-sourcing-missing-on-i386-and-x86_64 arch/i386/Kconfig
--- a/arch/i386/Kconfig~kconfiginstrumentation-sourcing-missing-on-i386-and-x86_64
+++ a/arch/i386/Kconfig
@@ -1258,6 +1258,8 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
+source "kernel/Kconfig.instrumentation"
+
 source "arch/i386/Kconfig.debug"
 
 source "security/Kconfig"
diff -puN arch/x86_64/Kconfig~kconfiginstrumentation-sourcing-missing-on-i386-and-x86_64 arch/x86_64/Kconfig
--- a/arch/x86_64/Kconfig~kconfiginstrumentation-sourcing-missing-on-i386-and-x86_64
+++ a/arch/x86_64/Kconfig
@@ -833,6 +833,8 @@ source "drivers/firmware/Kconfig"
 
 source fs/Kconfig
 
+source "kernel/Kconfig.instrumentation"
+
 source "arch/x86_64/Kconfig.debug"
 
 source "security/Kconfig"
_

Patches currently in -mm which might be from mathieu.desnoyers@xxxxxxxxxx are

origin.patch
kconfiginstrumentation-sourcing-missing-on-i386-and-x86_64.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