From mboxrd@z Thu Jan 1 00:00:00 1970 From: Geert Uytterhoeven Subject: Re: make headers_install broken for ARCH=m68k in 2.6.29-rc7. Date: Mon, 16 Mar 2009 23:08:39 +0100 Message-ID: <10f740e80903161508r3c5f2017sbdb45779662fc854@mail.gmail.com> References: <200903120437.03837.rob@landley.net> <10f740e80903130514k194fbdackd373d2951a9f76ba@mail.gmail.com> <49BE48B3.6060108@snapgear.com> <200903161521.00036.rob@landley.net> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <200903161521.00036.rob@landley.net> Sender: linux-next-owner@vger.kernel.org To: Rob Landley Cc: Greg Ungerer , Sam Ravnborg , linux-kernel@vger.kernel.org, dwmw2@infradead.org, linux-next@vger.kernel.org, linux-m68k@vger.kernel.org List-Id: linux-m68k@vger.kernel.org On Mon, Mar 16, 2009 at 21:20, Rob Landley wrote: > On Monday 16 March 2009 07:40:19 Greg Ungerer wrote: >> Geert Uytterhoeven wrote: >> > On Fri, Mar 13, 2009 at 11:52, Greg Ungerer wr= ote: >> >> Sam Ravnborg wrote: >> >>> On Fri, Mar 13, 2009 at 09:33:18AM +0100, Geert Uytterhoeven wro= te: >> >>>> On Fri, Mar 13, 2009 at 09:25, Sam Ravnborg = wrote: >> >>>>> On Fri, Mar 13, 2009 at 05:04:57PM +1000, Greg Ungerer wrote: >> >>>>>> I pretty quick time I can fix up the last couple on the above= list. >> >>>>>> But do we want to put all that change into 2.6.29-rc at this = point? >> >>>>> >> >>>>> In general we do not want to have headers_check broken in main= line, >> >>>> >> >>>> headers_check is not broken, headers_install is. >> >>>> >> >>>> Hmm, in some sense headers_check _is_ broken, as it doesn't not= ice >> >>>> headers_install >> >>>> installs headers that refer to other headers that are not insta= lled... >> >>> >> >>> This is what scripts/headers_check are supposed to do - strange. >> >>> >> >>>> Greg, I had a quick look at your signcontext.h and signal.h mer= ge, and >> >>>> the MMU >> >>>> part seems to be OK. >> >>>> >> >>>> However, some of the installed headers still have checks for >> >>>> CONFIG_MMU: >> >>>> >> >>>> param.h:#ifdef CONFIG_MMU >> >>>> sigcontext.h:#ifndef CONFIG_MMU >> >>>> sigcontext.h:#ifdef CONFIG_MMU >> >>>> siginfo.h:#ifdef CONFIG_MMU >> >>>> siginfo.h:#ifdef CONFIG_MMU >> >>>> siginfo.h:#endif /* CONFIG_MMU */ >> >>>> swab.h:#elif defined(CONFIG_MMU) >> >>>> >> >>>> so these have to be added to the generic unifdef-y list (is tha= t >> >>>> include/asm-generic/Kbuild.asm?). >> >> >> >> Hmmm, yes your right. >> >> >> >>> include/asm-generic/Kbuild.asm impacts all architectures so be c= arefull >> >>> there. >> >>> It looks like some updates to arch/m68k/include/asm/Kbuild is ne= eded, >> >>> and not the generic list of files to export. >> >>> >> >>> Also use og CONFIG_MMU suprises me. >> >>> We used #ifdef __uClinux__ in the non-merged headers to avoid us= e >> >>> of a CONFIG_* symbol that is not valid outside the kernel namesp= ace. >> >>> So if param.h in m68k uses CONFIG_MMU it is broken. >> >> >> >> I have been trying to use CONFIG_MMU wherever possible (so for no= n- >> >> exported headers), since that matches what is actually in the cod= e >> >> proper. I am concerned at the longer term use of __uClinux__ for >> >> distinguishing MMU and non-MMU. I plan on switching to use a norm= al >> >> m68k toolchain soon. And it won't define __uClinux__ on its own. >> >> (I already do this on ARM for example - same toolchain on both >> >> MMU an non-MMU). >> >> >> >> What I have done so far is or the most part a very simple merge >> >> of the files. I know there is room for some improvements in quite= a >> >> few of these files. >> >> >> >> The use of CONFIG_MMU in swab.h (is this actually exported to use= r >> >> space?) is not actually for code that is MMU or non-MMU. It is >> >> actually architecture specific. Most ColdFire parts don't have th= e >> >> "rolw" instruction. The condition test can be better. Geert, any >> >> ideas on what is more appropriate here? >> > >> > The `rolw' variant is already protected by `#if defined >> > (__mcfisaaplus__) || defined (__mcfisac__)', >> > so I think you can replace the `#elif defined(CONFIG_MMU)' by a pl= ain >> > `#else'. Or are there cases where you don't want to have __arch_sw= ab32 at >> > all? >> >> Not all ColdFire fit into '(__mcfisaaplus__) || defined (__mcfisac__= )' >> so #else won't be good enough. Though I suspect it is true that the >> older m68k varients (68328, etc) can do "rolw" - or I am I mistaken = on >> that? >> >> >> I can switch back to using __uClinux__ on siginfo.h and sigcontex= t.h. >> >> If I am not mistaken we can't change these structures without bre= aking >> >> backwards compatibility? =C2=A0The sigcontext change is particula= rly ugly :-( >> > >> > Copying the signal experts on linux-m68k... >> > >> >> Similarly for param.h, it looks like a switch back to using >> >> __uClinux__ for now is the only option. >> >> >> >> Now after these fixups should I create a git branch with these he= ader >> >> merges in for inclusion into 2.6.29-rc? =C2=A0To fix the regressi= on we >> >> only need to do the handful of files that Rob listed, right? >> > >> > Yes. >> >> Ok, I have created a git branch for this as: >> >> The following changes since commit >> 5bee17f18b595937e6beafeee5197868a3f74a06: Kyle McMartin (1): >> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0parisc: sba_iommu: fix build bug w= hen CONFIG_PARISC_AGP=3Dy >> >> are available in the git repository at: >> >> =C2=A0 =C2=A0git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68k= nommu.git >> fix-includes >> >> Greg Ungerer (8): >> =C2=A0 =C2=A0 =C2=A0 =C2=A0m68k: merge the non-MMU and MMU versions = of param.h >> =C2=A0 =C2=A0 =C2=A0 =C2=A0m68k: merge the non-MMU and MMU versions = of swab.h >> =C2=A0 =C2=A0 =C2=A0 =C2=A0m68k: merge the non-MMU and MMU versions = of sigcontext.h >> =C2=A0 =C2=A0 =C2=A0 =C2=A0m68k: merge the non-MMU and MMU versions = of siginfo.h >> =C2=A0 =C2=A0 =C2=A0 =C2=A0m68k: use MMU version of setup.h for both= MMU and non-MMU >> =C2=A0 =C2=A0 =C2=A0 =C2=A0m68k: merge the non-MMU and MMU versions = of ptrace.h >> =C2=A0 =C2=A0 =C2=A0 =C2=A0m68k: merge the non-MMU and MMU versions = of signal.h >> =C2=A0 =C2=A0 =C2=A0 =C2=A0m68k: use the MMU version of unistd.h for= all m68k platforms >> >> =C2=A0 arch/m68k/include/asm/param.h =C2=A0 =C2=A0 =C2=A0 =C2=A0 | =C2= =A0 25 ++- >> =C2=A0 arch/m68k/include/asm/param_mm.h =C2=A0 =C2=A0 =C2=A0| =C2=A0= 22 -- >> =C2=A0 arch/m68k/include/asm/param_no.h =C2=A0 =C2=A0 =C2=A0| =C2=A0= 22 -- >> =C2=A0 arch/m68k/include/asm/ptrace.h =C2=A0 =C2=A0 =C2=A0 =C2=A0| =C2= =A0 88 ++++++++- >> =C2=A0 arch/m68k/include/asm/ptrace_mm.h =C2=A0 =C2=A0 | =C2=A0 80 -= ------ >> =C2=A0 arch/m68k/include/asm/ptrace_no.h =C2=A0 =C2=A0 | =C2=A0 87 -= ------- >> =C2=A0 arch/m68k/include/asm/setup.h =C2=A0 =C2=A0 =C2=A0 =C2=A0 | =C2= =A0377 >> ++++++++++++++++++++++++++++++++- >> =C2=A0 arch/m68k/include/asm/setup_mm.h =C2=A0 =C2=A0 =C2=A0| =C2=A0= 376 >> -------------------------------- >> =C2=A0 arch/m68k/include/asm/setup_no.h =C2=A0 =C2=A0 =C2=A0| =C2=A0= 10 - >> =C2=A0 arch/m68k/include/asm/sigcontext.h =C2=A0 =C2=A0| =C2=A0 25 += +- >> =C2=A0 arch/m68k/include/asm/sigcontext_mm.h | =C2=A0 19 -- >> =C2=A0 arch/m68k/include/asm/sigcontext_no.h | =C2=A0 17 -- >> =C2=A0 arch/m68k/include/asm/siginfo.h =C2=A0 =C2=A0 =C2=A0 | =C2=A0= 95 ++++++++- >> =C2=A0 arch/m68k/include/asm/siginfo_mm.h =C2=A0 =C2=A0| =C2=A0 92 -= ------- >> =C2=A0 arch/m68k/include/asm/siginfo_no.h =C2=A0 =C2=A0| =C2=A0 =C2=A0= 6 - >> =C2=A0 arch/m68k/include/asm/signal.h =C2=A0 =C2=A0 =C2=A0 =C2=A0| =C2= =A0216 ++++++++++++++++++- >> =C2=A0 arch/m68k/include/asm/signal_mm.h =C2=A0 =C2=A0 | =C2=A0206 -= ----------------- >> =C2=A0 arch/m68k/include/asm/signal_no.h =C2=A0 =C2=A0 | =C2=A0159 -= ------------- >> =C2=A0 arch/m68k/include/asm/swab.h =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= | =C2=A0 30 +++- >> =C2=A0 arch/m68k/include/asm/swab_mm.h =C2=A0 =C2=A0 =C2=A0 | =C2=A0= 16 -- >> =C2=A0 arch/m68k/include/asm/swab_no.h =C2=A0 =C2=A0 =C2=A0 | =C2=A0= 24 -- >> =C2=A0 arch/m68k/include/asm/unistd.h =C2=A0 =C2=A0 =C2=A0 =C2=A0| =C2= =A0377 >> ++++++++++++++++++++++++++++++++- >> =C2=A0 arch/m68k/include/asm/unistd_mm.h =C2=A0 =C2=A0 | =C2=A0372 >> -------------------------------- >> =C2=A0 arch/m68k/include/asm/unistd_no.h =C2=A0 =C2=A0 | =C2=A0372 >> -------------------------------- >> =C2=A0 24 files changed, 1206 insertions(+), 1907 deletions(-) >> =C2=A0 delete mode 100644 arch/m68k/include/asm/param_mm.h >> =C2=A0 delete mode 100644 arch/m68k/include/asm/param_no.h >> =C2=A0 delete mode 100644 arch/m68k/include/asm/ptrace_mm.h >> =C2=A0 delete mode 100644 arch/m68k/include/asm/ptrace_no.h >> =C2=A0 delete mode 100644 arch/m68k/include/asm/setup_mm.h >> =C2=A0 delete mode 100644 arch/m68k/include/asm/setup_no.h >> =C2=A0 delete mode 100644 arch/m68k/include/asm/sigcontext_mm.h >> =C2=A0 delete mode 100644 arch/m68k/include/asm/sigcontext_no.h >> =C2=A0 delete mode 100644 arch/m68k/include/asm/siginfo_mm.h >> =C2=A0 delete mode 100644 arch/m68k/include/asm/siginfo_no.h >> =C2=A0 delete mode 100644 arch/m68k/include/asm/signal_mm.h >> =C2=A0 delete mode 100644 arch/m68k/include/asm/signal_no.h >> =C2=A0 delete mode 100644 arch/m68k/include/asm/swab_mm.h >> =C2=A0 delete mode 100644 arch/m68k/include/asm/swab_no.h >> =C2=A0 delete mode 100644 arch/m68k/include/asm/unistd_mm.h >> =C2=A0 delete mode 100644 arch/m68k/include/asm/unistd_no.h >> >> >> I have only patched those files that I saw mentioned in the previous >> emails in this thread. >> >> Geert, can you check an m68k build? You introduced a build regression by moving the #include to the bottom of arch/m68k/include/asm/siginfo.h. After fixing that (patch below, did gmail webmail preserve the tabs?), atari_defconfig builds and runs on ARAnyM. I'm now building a sun3_defconfig... diff --git a/arch/m68k/include/asm/siginfo.h b/arch/m68k/include/asm/si= ginfo.h index 9999e7d..f88b4a7 100644 --- a/arch/m68k/include/asm/siginfo.h +++ b/arch/m68k/include/asm/siginfo.h @@ -4,7 +4,11 @@ #ifndef __uClinux__ #define HAVE_ARCH_SIGINFO_T #define HAVE_ARCH_COPY_SIGINFO +#endif + +#include +#ifndef __uClinux__ typedef struct siginfo { int si_signo; int si_errno; @@ -89,6 +93,4 @@ static inline void copy_siginfo(struct siginfo *to, struct siginfo *from) #endif /* __KERNEL__ */ #endif /* __uClinux__ */ -#include - #endif >> Rob, can you check that you can build what you used to be able to? > > Nope. =C2=A0Pulled the repository, tarred it up, stuck it in my build= system, and > the uClibc build still dies attempting to generate syscalls: > > =C2=A0GEN include/bits/sysnum.h > In file included from :1: > /home/landley/firmware/firmware/build/cross-compiler- > m68k/include/asm/unistd.h:4:23: error: unistd_mm.h: No such file or d= irectory > In file included from :1: > /home/landley/firmware/firmware/build/cross-compiler- > m68k/include/asm/unistd.h:4:23: error: unistd_mm.h: No such file or d= irectory > ERROR: Could not generate syscalls. I guess you forgot to check out branch fix-includes? There's no unistd_= mm.h in that branch. --=20 Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-= m68k.org In personal conversations with technical people, I call myself a hacker= =2E But when I'm talking to journalists I just say "programmer" or something li= ke that. -- Linus Torvalds