Missing unistd_no.h and unistd_mm.h export on m68k

Missing unistd_no.h and unistd_mm.h export on m68k

[Lennart Sorensen]

make header_install fails to include the files unistd_no.h and
unistd_mm.h on m68k, while those two files are included by unistd.h.

This patch fixes this by adding these two files to the list of m68k
specific headers to export.

Signed-off-by: Len Sorensen <lsorense@csclub.uwaterloo.ca>

Signed
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 1a922fa..2bb4738 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -1,2 +1,2 @@
 include include/asm-generic/Kbuild.asm
-header-y += cachectl.h
+header-y += cachectl.h unistd_no.h unistd_mm.h

Re: Missing unistd_no.h and unistd_mm.h export on m68k

[Lennart Sorensen]

On Wed, Feb 04, 2009 at 01:14:53PM -0500, Lennart Sorensen wrote:
> make header_install fails to include the files unistd_no.h and
> unistd_mm.h on m68k, while those two files are included by unistd.h.
> 
> This patch fixes this by adding these two files to the list of m68k
> specific headers to export.
> 
> Signed-off-by: Len Sorensen <lsorense@csclub.uwaterloo.ca>
> 
> Signed
> diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
> index 1a922fa..2bb4738 100644
> --- a/arch/m68k/include/asm/Kbuild
> +++ b/arch/m68k/include/asm/Kbuild
> @@ -1,2 +1,2 @@
>  include include/asm-generic/Kbuild.asm
> -header-y += cachectl.h
> +header-y += cachectl.h unistd_no.h unistd_mm.h

Hmm, seems it is actually much worse than I thought.  All _no.h and
_mm.h are being missed, making m68k compiles of things like uclibc
rather broken.  Yuck.

-- 
Len Sorensen

Re: Missing unistd_no.h and unistd_mm.h export on m68k

[Lennart Sorensen]

On Wed, Feb 04, 2009 at 01:31:42PM -0500, Lennart Sorensen wrote:
> On Wed, Feb 04, 2009 at 01:14:53PM -0500, Lennart Sorensen wrote:
> > make header_install fails to include the files unistd_no.h and
> > unistd_mm.h on m68k, while those two files are included by unistd.h.
> > 
> > This patch fixes this by adding these two files to the list of m68k
> > specific headers to export.
> > 
> > Signed-off-by: Len Sorensen <lsorense@csclub.uwaterloo.ca>
> > 
> > Signed
> > diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
> > index 1a922fa..2bb4738 100644
> > --- a/arch/m68k/include/asm/Kbuild
> > +++ b/arch/m68k/include/asm/Kbuild
> > @@ -1,2 +1,2 @@
> >  include include/asm-generic/Kbuild.asm
> > -header-y += cachectl.h
> > +header-y += cachectl.h unistd_no.h unistd_mm.h
> 
> Hmm, seems it is actually much worse than I thought.  All _no.h and
> _mm.h are being missed, making m68k compiles of things like uclibc
> rather broken.  Yuck.

So updated patch that makes uclibc actually compile for m68k.

-- 
Len Sorensen



make header_install fails to include the files *_no.h and
*_mm.h on m68k, while those files are included by the matching *.h

This patch fixes this by adding these missing files to the list of m68k
specific headers to export.  With this patch, uclibc compiles again.

Signed-off-by: Len Sorensen <lsorense@csclub.uwaterloo.ca>

diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 1a922fa..c69926c 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -1,2 +1,2 @@
 include include/asm-generic/Kbuild.asm
-header-y += cachectl.h
+header-y += cachectl.h atomic_mm.h atomic_no.h bitops_mm.h bitops_no.h bootinfo_mm.h bootinfo_no.h bug_mm.h bug_no.h bugs_mm.h bugs_no.h cache_mm.h cache_no.h cacheflush_mm.h cacheflush_no.h checksum_mm.h checksum_no.h current_mm.h current_no.h delay_mm.h delay_no.h div64_mm.h div64_no.h dma-mapping_mm.h dma-mapping_no.h dma_mm.h dma_no.h elf_mm.h elf_no.h entry_mm.h entry_no.h fb_mm.h fb_no.h fpu_mm.h fpu_no.h hardirq_mm.h hardirq_no.h hw_irq_mm.h hw_irq_no.h io_mm.h io_no.h irq_mm.h irq_no.h kmap_types_mm.h kmap_types_no.h machdep_mm.h machdep_no.h mc146818rtc_mm.h mc146818rtc_no.h mmu_context_mm.h mmu_context_no.h mmu_mm.h mmu_no.h module_mm.h module_no.h page_mm.h page_no.h page_offset_mm.h page_offset_no.h param_mm.h param_no.h pci_mm.h pci_no.h pgalloc_mm.h pgalloc_no.h pgtable_mm.h pgtable_no.h processor_mm.h processor_no.h ptrace_mm.h ptrace_no.h scatterlist_mm.h scatterlist_no.h segment_mm.h segment_no.h setup_mm.h setup_no.h sigcontext_mm.h sigcontext_no.h siginfo_mm.h siginfo_no.h signal_mm.h signal_no.h string_mm.h string_no.h swab_mm.h swab_no.h system_mm.h system_no.h thread_info_mm.h thread_info_no.h timex_mm.h timex_no.h tlbflush_mm.h tlbflush_no.h traps_mm.h traps_no.h uaccess_mm.h uaccess_no.h ucontext_mm.h ucontext_no.h unaligned_mm.h unaligned_no.h unistd_mm.h unistd_no.h

Re: Missing unistd_no.h and unistd_mm.h export on m68k

[Lennart Sorensen]

Add linux-m68k@lists.linux-m68k.org to CC

-- 
Len Sorensen

On Wed, Feb 04, 2009 at 01:46:59PM -0500, Lennart Sorensen wrote:
> On Wed, Feb 04, 2009 at 01:31:42PM -0500, Lennart Sorensen wrote:
> > On Wed, Feb 04, 2009 at 01:14:53PM -0500, Lennart Sorensen wrote:
> > > make header_install fails to include the files unistd_no.h and
> > > unistd_mm.h on m68k, while those two files are included by unistd.h.
> > > 
> > > This patch fixes this by adding these two files to the list of m68k
> > > specific headers to export.
> > > 
> > > Signed-off-by: Len Sorensen <lsorense@csclub.uwaterloo.ca>
> > > 
> > > Signed
> > > diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
> > > index 1a922fa..2bb4738 100644
> > > --- a/arch/m68k/include/asm/Kbuild
> > > +++ b/arch/m68k/include/asm/Kbuild
> > > @@ -1,2 +1,2 @@
> > >  include include/asm-generic/Kbuild.asm
> > > -header-y += cachectl.h
> > > +header-y += cachectl.h unistd_no.h unistd_mm.h
> > 
> > Hmm, seems it is actually much worse than I thought.  All _no.h and
> > _mm.h are being missed, making m68k compiles of things like uclibc
> > rather broken.  Yuck.
> 
> So updated patch that makes uclibc actually compile for m68k.
> 
> -- 
> Len Sorensen
> 
> 
> 
> make header_install fails to include the files *_no.h and
> *_mm.h on m68k, while those files are included by the matching *.h
> 
> This patch fixes this by adding these missing files to the list of m68k
> specific headers to export.  With this patch, uclibc compiles again.
> 
> Signed-off-by: Len Sorensen <lsorense@csclub.uwaterloo.ca>
> 
> diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
> index 1a922fa..c69926c 100644
> --- a/arch/m68k/include/asm/Kbuild
> +++ b/arch/m68k/include/asm/Kbuild
> @@ -1,2 +1,2 @@
>  include include/asm-generic/Kbuild.asm
> -header-y += cachectl.h
> +header-y += cachectl.h atomic_mm.h atomic_no.h bitops_mm.h bitops_no.h bootinfo_mm.h bootinfo_no.h bug_mm.h bug_no.h bugs_mm.h bugs_no.h cache_mm.h cache_no.h cacheflush_mm.h cacheflush_no.h checksum_mm.h checksum_no.h current_mm.h current_no.h delay_mm.h delay_no.h div64_mm.h div64_no.h dma-mapping_mm.h dma-mapping_no.h dma_mm.h dma_no.h elf_mm.h elf_no.h entry_mm.h entry_no.h fb_mm.h fb_no.h fpu_mm.h fpu_no.h hardirq_mm.h hardirq_no.h hw_irq_mm.h hw_irq_no.h io_mm.h io_no.h irq_mm.h irq_no.h kmap_types_mm.h kmap_types_no.h machdep_mm.h machdep_no.h mc146818rtc_mm.h mc146818rtc_no.h mmu_context_mm.h mmu_context_no.h mmu_mm.h mmu_no.h module_mm.h module_no.h page_mm.h page_no.h page_offset_mm.h page_offset_no.h param_mm.h param_no.h pci_mm.h pci_no.h pgalloc_mm.h pgalloc_no.h pgtable_mm.h pgtable_no.h processor_mm.h processor_no.h ptrace_mm.h ptrace_no.h scatterlist_mm.h scatterlist_no.h segment_mm.h segment_no.h setup_mm.h setup_no.h sigcontext_mm.h sigcontext_no.h siginfo_mm.h siginfo_no.h signal_mm.h signal_no.h string_mm.h string_no.h swab_mm.h swab_no.h system_mm.h system_no.h thread_info_mm.h thread_info_no.h timex_mm.h timex_no.h tlbflush_mm.h tlbflush_no.h traps_mm.h traps_no.h uaccess_mm.h uaccess_no.h ucontext_mm.h ucontext_no.h unaligned_mm.h unaligned_no.h unistd_mm.h unistd_no.h
> --
> 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/

Re: Missing unistd_no.h and unistd_mm.h export on m68k

[Sam Ravnborg]

On Wed, Feb 04, 2009 at 01:46:59PM -0500, Lennart Sorensen wrote:
> On Wed, Feb 04, 2009 at 01:31:42PM -0500, Lennart Sorensen wrote:
> > On Wed, Feb 04, 2009 at 01:14:53PM -0500, Lennart Sorensen wrote:
> > > make header_install fails to include the files unistd_no.h and
> > > unistd_mm.h on m68k, while those two files are included by unistd.h.
> > > 
> > > This patch fixes this by adding these two files to the list of m68k
> > > specific headers to export.
> > > 
> > > Signed-off-by: Len Sorensen <lsorense@csclub.uwaterloo.ca>
> > > 
> > > Signed
> > > diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
> > > index 1a922fa..2bb4738 100644
> > > --- a/arch/m68k/include/asm/Kbuild
> > > +++ b/arch/m68k/include/asm/Kbuild
> > > @@ -1,2 +1,2 @@
> > >  include include/asm-generic/Kbuild.asm
> > > -header-y += cachectl.h
> > > +header-y += cachectl.h unistd_no.h unistd_mm.h
> > 
> > Hmm, seems it is actually much worse than I thought.  All _no.h and
> > _mm.h are being missed, making m68k compiles of things like uclibc
> > rather broken.  Yuck.
> 
> So updated patch that makes uclibc actually compile for m68k.
> 
> -- 
> Len Sorensen
> 
> 
> 
> make header_install fails to include the files *_no.h and
> *_mm.h on m68k, while those files are included by the matching *.h
> 
> This patch fixes this by adding these missing files to the list of m68k
> specific headers to export.  With this patch, uclibc compiles again.

Hi Len.

Indeed the *_no.h, *_mm.h is missing from Kbuild.h.
But looking at your patch you added much more than the
missing *_no.h, *_mm.h.
When doing this do it in steps:
1) fix make headers_check
   This is fixed by adding the *_no.h,*_mm.h for files that
   are exported. And that is the files lited in include/asm-generic/Kbuild.asm
   plus the single file listed in the m68k Kbuld file.

2) then as a separate patch export the additional files needed to build
   ulibc.
   Do it file-by-file so you are sure you do not add a single file
   that is not needed. We want to have a minimal set of files exported.

And when you prepare your patch please use one line per header file,
as we do in all the ohter Kbuild files.

	Sam

Re: Missing unistd_no.h and unistd_mm.h export on m68k

[Lennart Sorensen]

On Thu, Feb 05, 2009 at 06:53:37AM +0100, Sam Ravnborg wrote:
> Indeed the *_no.h, *_mm.h is missing from Kbuild.h.
> But looking at your patch you added much more than the
> missing *_no.h, *_mm.h.
> When doing this do it in steps:
> 1) fix make headers_check
>    This is fixed by adding the *_no.h,*_mm.h for files that
>    are exported. And that is the files lited in include/asm-generic/Kbuild.asm
>    plus the single file listed in the m68k Kbuld file.
> 
> 2) then as a separate patch export the additional files needed to build
>    ulibc.
>    Do it file-by-file so you are sure you do not add a single file
>    that is not needed. We want to have a minimal set of files exported.
> 
> And when you prepare your patch please use one line per header file,
> as we do in all the ohter Kbuild files.

Well if the exported unistd.h file says:

#ifdef __uClinux__
#include "unistd_no.h"
#else
#include "unistd_mm.h"
#endif

Then I expect BOTH files to be present since I might want to compile
both glibc and uclibc against this set of headers.

Leaving out either would be broken.

I do seem to have got carried away after I encountered one after
another.  I will try to find a smaller list of what should actually be
exported.  Now perhaps some of the headers don't need this split, which
would simplify things.

So here is an updated patch that isn't carried away.  This includes the
8 pairs of files that are included by header files that are in fact
exported already.  This makes the header files consistent on m68k no
matter what you are compiling against them.

Does this look better?

I checked this way:
linux-headers/include/asm# grep _no.h *
param.h:#include "param_no.h"
ptrace.h:#include "ptrace_no.h"
setup.h:#include "setup_no.h"
sigcontext.h:#include "sigcontext_no.h"
siginfo.h:#include "siginfo_no.h"
signal.h:#include "signal_no.h"
swab.h:#include "swab_no.h"
unistd.h:#include "unistd_no.h"

linux-headers/include/asm# ls *_no.h|cat
param_no.h
ptrace_no.h
setup_no.h
sigcontext_no.h
siginfo_no.h
signal_no.h
swab_no.h
unistd_no.h

linux-headers/include/asm# ls *_mm.h|cat
param_mm.h
ptrace_mm.h
setup_mm.h
sigcontext_mm.h
siginfo_mm.h
signal_mm.h
swab_mm.h
unistd_mm.h

-- 
Len Sorensen

The header files exported on m68k are missing dependant header files
that are included by some of the epxorted files.  This includes the 8
missing pairs of files needed by normal and uclibc builds against the
headers files.

Signed-of-by: Len Sorensen <lsorense@csclub.uwaterloo.ca>

diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 1a922fa..f13d614 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -1,2 +1,2 @@
 include include/asm-generic/Kbuild.asm
-header-y += cachectl.h
+header-y += cachectl.h param_mm.h param_no.h ptrace_mm.h ptrace_no.h setup_mm.h setup_no.h sigcontext_mm.h sigcontext_no.h siginfo_mm.h siginfo_no.h signal_mm.h signal_no.h swab_mm.h swab_no.h unistd_mm.h unistd_no.h

Re: Missing unistd_no.h and unistd_mm.h export on m68k

[Lennart Sorensen]

On Thu, Feb 05, 2009 at 10:51:04AM -0500, Lennart Sorensen wrote:

Oops, I forgot to do one of the requested fixes to the patch.

Here is a better one.

-- 
Len Sorensen

The header files exported on m68k are missing dependant header files
that are included by some of the epxorted files.  This includes the 8
missing pairs of files needed by normal and uclibc builds against the
headers files.

Signed-of-by: Len Sorensen <lsorense@csclub.uwaterloo.ca>

diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 1a922fa..d477927 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -1,2 +1,18 @@
 include include/asm-generic/Kbuild.asm
 header-y += cachectl.h
+header-y += param_mm.h
+header-y += param_no.h
+header-y += ptrace_mm.h
+header-y += ptrace_no.h
+header-y += setup_mm.h
+header-y += setup_no.h
+header-y += sigcontext_mm.h
+header-y += sigcontext_no.h
+header-y += siginfo_mm.h
+header-y += siginfo_no.h
+header-y += signal_mm.h
+header-y += signal_no.h
+header-y += swab_mm.h
+header-y += swab_no.h
+header-y += unistd_mm.h
+header-y += unistd_no.h

Re: Missing unistd_no.h and unistd_mm.h export on m68k

[Sam Ravnborg]

On Thu, Feb 05, 2009 at 10:54:52AM -0500, Lennart Sorensen wrote:
> On Thu, Feb 05, 2009 at 10:51:04AM -0500, Lennart Sorensen wrote:
> 
> Oops, I forgot to do one of the requested fixes to the patch.
> 
> Here is a better one.

This looks much better.
I know patches are floating around that unify unistd.h and maybe
a few more files, so it needs to be adapted to this when applied.
But otherwise it has by:

Acked-by: Sam Ravnborg <sam@ravnborg.org>

	Sam