From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753721Ab2D2Mrb (ORCPT ); Sun, 29 Apr 2012 08:47:31 -0400 Received: from mail.skyhub.de ([78.46.96.112]:41160 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750880Ab2D2Mr3 (ORCPT ); Sun, 29 Apr 2012 08:47:29 -0400 Date: Sun, 29 Apr 2012 14:47:24 +0200 From: Borislav Petkov To: Kevin Winchester Cc: "H. Peter Anvin" , Nick Bowler , Thomas Gleixner , Ingo Molnar , linux-kernel@vger.kernel.org, Randy Dunlap Subject: Re: [PATCH v5 0/5] x86: Cleanup and simplify cpu-specific data Message-ID: <20120429124724.GA27784@liondog.tnic> Mail-Followup-To: Borislav Petkov , Kevin Winchester , "H. Peter Anvin" , Nick Bowler , Thomas Gleixner , Ingo Molnar , linux-kernel@vger.kernel.org, Randy Dunlap References: <20120227115905.GB9943@elte.hu> <1332974587-15452-1-git-send-email-kjwinchester@gmail.com> <4F99A69B.4040004@zytor.com> <1a0aaa16-df06-40bf-88c7-28180455e6b9@email.android.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Apr 27, 2012 at 08:37:36PM -0300, Kevin Winchester wrote: > Alright, my git/make skills must be lacking. I just checked out > 3.4-rc4 to a new branch, and then git cherry-picked my 5 patches onto > that branch. FWIW, you probably would need to rediff them again because they don't apply cleanly on current linus (v3.4-rc4-308-gf7b006931751): x86: Move per cpu cpu_llc_id to a field in struct cpuinfo_x86 This simplifies the various code paths using this field as it groups the per-cpu data together. Acked-by: Borislav Petkov Signed-off-by: Kevin Winchester -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: x86: Move per cpu cpu_llc_id to a field in struct cpuinfo_x86 error: patch failed: arch/x86/kernel/apic/apic_numachip.c:208 error: arch/x86/kernel/apic/apic_numachip.c: patch does not apply error: patch failed: arch/x86/kernel/cpu/amd.c:350 error: arch/x86/kernel/cpu/amd.c: patch does not apply Patch failed at 0002 x86: Move per cpu cpu_llc_id to a field in struct cpuinfo_x86 When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Or it could be due to fuzz which git cannot stomach but patch can. Anyway, applying the mbox of your 5 patches on -rc4 got me further but choked on the last patch: Applying: x86: Remove #ifdef CONFIG_SMP sections by moving smp_num_siblings into common.c error: patch failed: arch/x86/kernel/process.c:17 error: arch/x86/kernel/process.c: patch does not apply Patch failed at 0005 x86: Remove #ifdef CONFIG_SMP sections by moving smp_num_siblings into common.c When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Applying it with patch worked though, probably due to fuzziness. > Then I ran: > > $ make ARCH=i386 allnoconfig > $ make ARCH=i386 > > And the build completed without warnings or errors. Should that be > equivalent to what you did to build i386 allnoconfig? If so, then I > wonder why I would not see those problems. > > Can anyone offer any advice? Other than that, i386 all{no,yes,mod}config seem to build fine here. -- Regards/Gruss, Boris.