Skip to contentSkip to conversation

compat: ppc stable assembly fix

PATCH New Luis R. Rodriguez 1 participant 2 messages Jan 23, 2013

lore
Share & tools
lore
#0 lore raw

cover compat: ppc stable assembly fix

From: "Luis R. Rodriguez" <[email protected]>

Hauke,

here's a patch I had almost missed by Felix for compat. I've test compiled this with ckmake against master branch of compat, compat-drivers on the linux-next tag next-20130123 (today's release). This fix should also be applied to the linux-3.8.y and linux-3.7.y branches.

The below is the ckmake log on compat-drivers after applying the patch to compat.

1   2.6.24              [  OK  ]
2   2.6.25              [  OK  ]
3   2.6.26              [  OK  ]
4   2.6.27              [  OK  ]
5   2.6.28              [  OK  ]
6   2.6.29              [  OK  ]
7   2.6.30              [  OK  ]
8   2.6.31              [  OK  ]
9   2.6.32              [  OK  ]
10  2.6.33              [  OK  ]
11  2.6.34              [  OK  ]
12  2.6.35              [  OK  ]
13  2.6.36              [  OK  ]
14  2.6.37              [  OK  ]
15  2.6.38              [  OK  ]
16  2.6.39              [  OK  ]
17  3.0.50              [  OK  ]
18  3.1.10              [  OK  ]
19  3.2.33              [  OK  ]
20  3.3.8               [  OK  ]
21  3.4.17              [  OK  ]
22  3.5.7               [  OK  ]
23  3.6.5               [  OK  ]
24  3.7.0               [  OK  ]
real    13m33.413s
user    336m14.841s
sys     48m46.255s

Felix Fietkau (1):
compat: fix compile errors when assembly is built into modules

 include/linux/compat-2.6.h |    4 ++++
 1 file changed, 4 insertions(+)
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 compat: fix compile errors when assembly is built into modules

From: Felix Fietkau <[email protected]>

On powerpc, modules can be compiled and linked with an assembly file, adding missing symbols that the compiler references when using -Os.

== ckmake-report.log ==

1   2.6.24              [  OK  ]
2   2.6.25              [  OK  ]
3   2.6.26              [  OK  ]
4   2.6.27              [  OK  ]
5   2.6.28              [  OK  ]
6   2.6.29              [  OK  ]
7   2.6.30              [  OK  ]
8   2.6.31              [  OK  ]
9   2.6.32              [  OK  ]
10  2.6.33              [  OK  ]
11  2.6.34              [  OK  ]
12  2.6.35              [  OK  ]
13  2.6.36              [  OK  ]
14  2.6.37              [  OK  ]
15  2.6.38              [  OK  ]
16  2.6.39              [  OK  ]
17  3.0.50              [  OK  ]
18  3.1.10              [  OK  ]
19  3.2.33              [  OK  ]
20  3.3.8               [  OK  ]
21  3.4.17              [  OK  ]
22  3.5.7               [  OK  ]
23  3.6.5               [  OK  ]
24  3.7.0               [  OK  ]
real    0m33.803s
user    11m24.519s
sys     3m39.690s
---
 include/linux/compat-2.6.h |    4 ++++
 1 file changed, 4 insertions(+)
include/linux/compat-2.6.h +4 -0
index 00a5eda..34c49e6 100644
@@ -1,6 +1,8 @@
 #ifndef LINUX_26_COMPAT_H
 #define LINUX_26_COMPAT_H
 
+#ifndef __ASSEMBLY__
+
 #include <linux/version.h>
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
 #include <linux/kconfig.h>
@@ -68,4 +70,6 @@ void compat_dependency_symbol(void);
 #include <linux/compat-3.7.h>
 #include <linux/compat-3.8.h>
 
+#endif /* __ASSEMBLY__ */
+
 #endif /* LINUX_26_COMPAT_H */
Signature · 1 line
1.7.10.4