Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac851744 authored by Paul Burton's avatar Paul Burton Committed by Masahiro Yamada
Browse files

powerpc: Remove -Wattribute-alias pragmas 



With SYSCALL_DEFINEx() disabling -Wattribute-alias generically, there's
no need to duplicate that for PowerPC syscalls.

This reverts commit 41552037 ("powerpc: fix build failure by
disabling attribute-alias warning in pci_32") and commit 2479bfc9
("powerpc: Fix build by disabling attribute-alias warning for
SYSCALL_DEFINEx").

Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Acked-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Acked-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent bee20031

arch/powerpc/kernel/pci_32.c

+0 −4
Original line number Diff line number Diff line
@@ -285,9 +285,6 @@ pci_bus_to_hose(int bus) 
 * Note that the returned IO or memory base is a physical address

 */



#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wpragmas"

#pragma GCC diagnostic ignored "-Wattribute-alias"

SYSCALL_DEFINE3(pciconfig_iobase, long, which,

		unsigned long, bus, unsigned long, devfn)

{
@@ -313,4 +310,3 @@ SYSCALL_DEFINE3(pciconfig_iobase, long, which, 


	return result;

}
 
#pragma GCC diagnostic pop

arch/powerpc/kernel/pci_64.c

+0 −4
Original line number Diff line number Diff line
@@ -203,9 +203,6 @@ void pcibios_setup_phb_io_space(struct pci_controller *hose) 
#define IOBASE_ISA_IO		3

#define IOBASE_ISA_MEM		4



#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wpragmas"

#pragma GCC diagnostic ignored "-Wattribute-alias"

SYSCALL_DEFINE3(pciconfig_iobase, long, which, unsigned long, in_bus,

			  unsigned long, in_devfn)

{
@@ -259,7 +256,6 @@ SYSCALL_DEFINE3(pciconfig_iobase, long, which, unsigned long, in_bus, 


	return -EOPNOTSUPP;

}

#pragma GCC diagnostic pop



#ifdef CONFIG_NUMA

int pcibus_to_node(struct pci_bus *bus)

arch/powerpc/kernel/rtas.c

+0 −4
Original line number Diff line number Diff line
@@ -1051,9 +1051,6 @@ struct pseries_errorlog *get_pseries_errorlog(struct rtas_error_log *log, 
}



/* We assume to be passed big endian arguments */

#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wpragmas"

#pragma GCC diagnostic ignored "-Wattribute-alias"

SYSCALL_DEFINE1(rtas, struct rtas_args __user *, uargs)

{

	struct rtas_args args;
@@ -1140,7 +1137,6 @@ SYSCALL_DEFINE1(rtas, struct rtas_args __user *, uargs) 


	return 0;

}

#pragma GCC diagnostic pop



/*

 * Call early during boot, before mem init, to retrieve the RTAS

arch/powerpc/kernel/signal_32.c

+0 −8
Original line number Diff line number Diff line
@@ -1038,9 +1038,6 @@ static int do_setcontext_tm(struct ucontext __user *ucp, 
}

#endif



#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wpragmas"

#pragma GCC diagnostic ignored "-Wattribute-alias"

#ifdef CONFIG_PPC64

COMPAT_SYSCALL_DEFINE3(swapcontext, struct ucontext __user *, old_ctx,

		       struct ucontext __user *, new_ctx, int, ctx_size)
@@ -1134,7 +1131,6 @@ SYSCALL_DEFINE3(swapcontext, struct ucontext __user *, old_ctx, 
	set_thread_flag(TIF_RESTOREALL);

	return 0;

}

#pragma GCC diagnostic pop



#ifdef CONFIG_PPC64

COMPAT_SYSCALL_DEFINE0(rt_sigreturn)
@@ -1231,9 +1227,6 @@ SYSCALL_DEFINE0(rt_sigreturn) 
	return 0;

}



#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wpragmas"

#pragma GCC diagnostic ignored "-Wattribute-alias"

#ifdef CONFIG_PPC32

SYSCALL_DEFINE3(debug_setcontext, struct ucontext __user *, ctx,

			 int, ndbg, struct sig_dbg_op __user *, dbg)
@@ -1337,7 +1330,6 @@ SYSCALL_DEFINE3(debug_setcontext, struct ucontext __user *, ctx, 
	return 0;

}

#endif

#pragma GCC diagnostic pop



/*

 * OK, we're invoking a handler

arch/powerpc/kernel/signal_64.c

+0 −4
Original line number Diff line number Diff line
@@ -625,9 +625,6 @@ static long setup_trampoline(unsigned int syscall, unsigned int __user *tramp) 
/*

 * Handle {get,set,swap}_context operations

 */

#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wpragmas"

#pragma GCC diagnostic ignored "-Wattribute-alias"

SYSCALL_DEFINE3(swapcontext, struct ucontext __user *, old_ctx,

		struct ucontext __user *, new_ctx, long, ctx_size)

{
@@ -693,7 +690,6 @@ SYSCALL_DEFINE3(swapcontext, struct ucontext __user *, old_ctx, 
	set_thread_flag(TIF_RESTOREALL);

	return 0;

}

#pragma GCC diagnostic pop





/*