lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 8 Sep 2008 17:17:53 +0200 From: Ingo Molnar <mingo@...e.hu> To: Vegard Nossum <vegard.nossum@...il.com> Cc: Pekka Enberg <penberg@...helsinki.fi>, linux-kernel@...r.kernel.org Subject: Re: [GIT PULL] kmemcheck updates for tip/kmemcheck * Vegard Nossum <vegard.nossum@...il.com> wrote: > Ingo, > > Here follows a small update to the REP instruction handling and > removal of some obsolete code (if you worry that this is useful code, > git will save it for us and it can be revived if needed. I believe > that the code is simply a burden as it is today). pulled into tip/kmemcheck, thanks Vegard! > I couldn't figure out how to merge v2.6.27-rc5 without littering the > pull request with all the commits that were made in Linus's repository > since v2.6.27-rc3, but feel free to do it yourself. There should be no > conflicts. yeah, merges should generally be done in the upstream repo. Obviously git-request-pull must list all the commits that happened - it doesnt know which commits are 'interesting' or not. I've done an upstream merge. btw., a small build fix (see below) was needed. Ingo ----------------> >From 92a9abb2c571ab8fedaee3537c5667b4e61188ce Mon Sep 17 00:00:00 2001 From: Ingo Molnar <mingo@...e.hu> Date: Mon, 8 Sep 2008 16:50:43 +0200 Subject: [PATCH] kmemcheck: build fix MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit fix: arch/x86/mm/kmemcheck/kmemcheck.c: In function ‘kmemcheck_init’: arch/x86/mm/kmemcheck/kmemcheck.c:42: error: ‘setup_max_cpus’ undeclared (first use in this function) arch/x86/mm/kmemcheck/kmemcheck.c:42: error: (Each undeclared identifier is reported only once arch/x86/mm/kmemcheck/kmemcheck.c:42: error: for each function it appears in.) Signed-off-by: Ingo Molnar <mingo@...e.hu> --- arch/x86/mm/kmemcheck/kmemcheck.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c index eef8c6a..75831f0 100644 --- a/arch/x86/mm/kmemcheck/kmemcheck.c +++ b/arch/x86/mm/kmemcheck/kmemcheck.c @@ -35,6 +35,7 @@ void __init kmemcheck_init(void) { printk(KERN_INFO "kmemcheck: \"Bugs, beware!\"\n"); +#if defined(CONFIG_SMP) && !defined(CONFIG_KMEMCHECK_USE_SMP) /* * Limit SMP to use a single CPU. We rely on the fact that this code * runs before SMP is set up. @@ -44,6 +45,7 @@ void __init kmemcheck_init(void) "kmemcheck: Limiting number of CPUs to 1.\n"); setup_max_cpus = 1; } +#endif } #ifdef CONFIG_KMEMCHECK_DISABLED_BY_DEFAULT -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists