![]() | ||||||||||
Messages in this thread |
On Wednesday 26 October 2005 09:22, Andrew Morton wrote: > "Paolo 'Blaisorblade' Giarrusso" <blaisorblade@yahoo.it> wrote: > > arch/i386/Kconfig | 304 > > ------------------------------------------------ arch/i386/Kconfig.cpu | > > 305 ++++++++++++++++++++++++++++++++++++++++++++++++ > > Have mercy. I currently have twelve patches which alter arch/i386/Kconfig > and this patch conflicts with most of them. This shouldn't come as a > surprise - Kconfig files are oft-patched, and this is x86. Yep - if we get no objection with this, I could pull any changes in -mm and merge the patch directly Linuswards at some point, since it has so many conflicts. So, you can probably leave what you have there. > What I did was to simply copy the large block between > if !X86_ELAN > > and > > config X86_OOSTORE > > over into Kconfig.cpu, taking the modifications with it. I also took X86_TSC with me, in my patch. > As long as that's also what you did things should work OK. If you actually > made any changes as you did the copy-and-paste, we're screwed. No, I didn't do real changes - I just added a couple of comments. However yes, should have splitout in copy+paste and changes +# Put here option for CPU selection and depending optimization [...] and the comment near "endif" to say what is it closing: +#!X86_ELAN -- Inform me of my mistakes, so I can keep imitating Homer Simpson's "Doh!". Paolo Giarrusso, aka Blaisorblade (Skype ID "PaoloGiarrusso", ICQ 215621894) http://www.user-mode-linux.org/~blaisorblade ___________________________________ Yahoo! Mail: gratis 1GB per i messaggi e allegati da 10MB http://mail.yahoo.it - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ | |||||||||
| Last update: 2005-10-26 07:18 [W:0.251 / U:0.330 seconds] ©2003-2008 Jasper Spaans | ||||||||||