[2.6.5][MIPS] oneliners somehow not made it into mainline [1/3]

[2.6.5][MIPS] oneliners somehow not made it into mainline [1/3]

[Samium Gromoff]

Without this one it fails to build.

diff -urN -X './#cdiff.pattern' ./linux-2.6.5/include/asm-mips/unistd.h ./mc-2.6.5/include/asm-mips/unistd.h
--- ./linux-2.6.5/include/asm-mips/unistd.h     2004-04-12 16:04:46.000000000 +0400
+++ ./mc-2.6.5/include/asm-mips/unistd.h        2004-04-12 17:02:54.000000000 +0400
@@ -1047,6 +1047,7 @@

 #ifdef __KERNEL_SYSCALLS__

+#include <linux/linkage.h>
 #include <linux/compiler.h>
 #include <linux/types.h>
 #include <asm/ptrace.h>

[2.6.5][MIPS] oneliners somehow not made it into mainline [2/3]

[Samium Gromoff]

Without this one it fails to build, too.

diff -urN -X './#cdiff.pattern' ./linux-2.6.5/fs/stat.c ./mc-2.6.5/fs/stat.c
--- ./linux-2.6.5/fs/stat.c     2004-04-12 16:07:38.000000000 +0400
+++ ./mc-2.6.5/fs/stat.c        2004-04-12 17:33:07.000000000 +0400
@@ -107,7 +107,8 @@

 #if !defined(__alpha__) && !defined(__sparc__) && !defined(__ia64__) \
   && !defined(CONFIG_ARCH_S390) && !defined(__hppa__) \
-  && !defined(__arm__) && !defined(CONFIG_V850) && !defined(__powerpc64__)
+  && !defined(__arm__) && !defined(CONFIG_V850) && !defined(__powerpc64__) \
+  && !defined(__mips__)

 /*
  * For backward compatibility?  Maybe this should be moved

[2.6.5][MIPS] oneliners somehow not made it into mainline [3/3]

[Samium Gromoff]

Without this one it fails to run the earlyinitcall stuff, and hence
explodes at some point.

diff -urN -X './#cdiff.pattern' ./linux-2.6.5/include/linux/init.h ./mc-2.6.5/include/linux/init.h
--- ./linux-2.6.5/include/linux/init.h  2004-04-12 16:07:45.000000000 +0400
+++ ./mc-2.6.5/include/linux/init.h     2004-04-12 18:05:28.000000000 +0400
@@ -83,6 +83,7 @@
        static initcall_t __initcall_##fn __attribute_used__ \
        __attribute__((__section__(".initcall" level ".init"))) = fn

+#define early_initcall(fn)             __define_initcall(".early1",fn)
 #define core_initcall(fn)              __define_initcall("1",fn)
 #define postcore_initcall(fn)          __define_initcall("2",fn)
 #define arch_initcall(fn)              __define_initcall("3",fn)

Re: [2.6.5][MIPS] oneliners somehow not made it into mainline [3/3]

[Andrew Morton]

Samium Gromoff <deepfire@sic-elvis.zel.ru> wrote:
>
> Without this one it fails to run the earlyinitcall stuff, and hence
> explodes at some point.
> 
> diff -urN -X './#cdiff.pattern' ./linux-2.6.5/include/linux/init.h ./mc-2.6.5/include/linux/init.h
> --- ./linux-2.6.5/include/linux/init.h  2004-04-12 16:07:45.000000000 +0400
> +++ ./mc-2.6.5/include/linux/init.h     2004-04-12 18:05:28.000000000 +0400
> @@ -83,6 +83,7 @@
>         static initcall_t __initcall_##fn __attribute_used__ \
>         __attribute__((__section__(".initcall" level ".init"))) = fn
> 
> +#define early_initcall(fn)             __define_initcall(".early1",fn)
>  #define core_initcall(fn)              __define_initcall("1",fn)
>  #define postcore_initcall(fn)          __define_initcall("2",fn)
>  #define arch_initcall(fn)              __define_initcall("3",fn)

early_initcall() is a mips-specific thing.  If we add this macro to
<linux/init.h> then someone will use it in generic code and all the other
architectures explode.

We need to either make this entirely mips-private, or rework the mips code
to not use it at all, or justify its introduction and then introduce it for
all architectures.