Skip to contentSkip to conversation

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

PATCH Samium Gromoff 2 participants 4 messages Apr 12, 2004

lore
Share & tools
lore
#0 lore raw

Without this one it fails to build.

mc-2.6.5/include/asm-mips/unistd.h 2004-04-12 17:02:54.000000000 +0400 renamed from linux-2.6.5/include/asm-mips/unistd.h 2004-04-12 16:04:46.000000000 +0400 +1 -0
diff -urN -X './#cdiff.pattern' ./linux-2.6.5/include/asm-mips/unistd.h ./mc-2.6.5/include/asm-mips/unistd.h
@@ -1047,6 +1047,7 @@
 
 #ifdef __KERNEL_SYSCALLS__
 
+#include <linux/linkage.h>
 #include <linux/compiler.h>
 #include <linux/types.h>
 #include <asm/ptrace.h>
#1 lore raw

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

Without this one it fails to build, too.

mc-2.6.5/fs/stat.c 2004-04-12 17:33:07.000000000 +0400 renamed from linux-2.6.5/fs/stat.c 2004-04-12 16:07:38.000000000 +0400 +2 -1
diff -urN -X './#cdiff.pattern' ./linux-2.6.5/fs/stat.c ./mc-2.6.5/fs/stat.c
@@ -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 lore raw

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

In reply to Samium Gromoff

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

mc-2.6.5/include/linux/init.h 2004-04-12 18:05:28.000000000 +0400 renamed from linux-2.6.5/include/linux/init.h 2004-04-12 16:07:45.000000000 +0400 +1 -0
diff -urN -X './#cdiff.pattern' ./linux-2.6.5/include/linux/init.h ./mc-2.6.5/include/linux/init.h
@@ -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)
#3 lore raw

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

Quoted 8 lines · 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

mc-2.6.5/include/linux/init.h 2004-04-12 18:05:28.000000000 +0400 line 89

Quoted 7 lines
mc-2.6.5/include/linux/init.h 2004-04-12 18:05:28.000000000 +0400 renamed from linux-2.6.5/include/linux/init.h 2004-04-12 16:07:45.000000000 +0400 +1 -0
@@ -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.