aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Leroy <christophe.leroy@c-s.fr>2018-06-05 02:57:43 -0400
committerMichael Ellerman <mpe@ellerman.id.au>2018-06-05 07:34:20 -0400
commit415520373975d2eba565c256d2cad875ed4e9243 (patch)
tree01c041ea7b3341e209f420f299befdab7943d442
parent2e5c93d6bb2f7bc17eb82748943a1b9f6b068520 (diff)
powerpc: fix build failure by disabling attribute-alias warning in pci_32
Commit 2479bfc9bc600 ("powerpc: Fix build by disabling attribute-alias warning for SYSCALL_DEFINEx") forgot arch/powerpc/kernel/pci_32.c Latest GCC version emit the following warnings As arch/powerpc code is built with -Werror, this breaks build with GCC 8.1 This patch inhibits this warning In file included from arch/powerpc/kernel/pci_32.c:14: ./include/linux/syscalls.h:233:18: error: 'sys_pciconfig_iobase' alias between functions of incompatible types 'long int(long int, long unsigned int, long unsigned int)' and 'long int(long int, long int, long int)' [-Werror=attribute-alias] asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) \ ^~~ ./include/linux/syscalls.h:222:2: note: in expansion of macro '__SYSCALL_DEFINEx' __SYSCALL_DEFINEx(x, sname, __VA_ARGS__) ^~~~~~~~~~~~~~~~~ Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r--arch/powerpc/kernel/pci_32.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index d63b488d34d7..4f861055a852 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -285,6 +285,9 @@ pci_bus_to_hose(int bus)
285 * Note that the returned IO or memory base is a physical address 285 * Note that the returned IO or memory base is a physical address
286 */ 286 */
287 287
288#pragma GCC diagnostic push
289#pragma GCC diagnostic ignored "-Wpragmas"
290#pragma GCC diagnostic ignored "-Wattribute-alias"
288SYSCALL_DEFINE3(pciconfig_iobase, long, which, 291SYSCALL_DEFINE3(pciconfig_iobase, long, which,
289 unsigned long, bus, unsigned long, devfn) 292 unsigned long, bus, unsigned long, devfn)
290{ 293{
@@ -310,3 +313,4 @@ SYSCALL_DEFINE3(pciconfig_iobase, long, which,
310 313
311 return result; 314 return result;
312} 315}
316#pragma GCC diagnostic pop