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

Commit 22d3e0c3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v4.18' of... 

Merge tag 'kbuild-fixes-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:

 - introduce __diag_* macros and suppress -Wattribute-alias warnings
   from GCC 8

 - fix stack protector test script for x86_64

 - fix line number handling in Kconfig

 - document that '#' starts a comment in Kconfig

 - handle P_SYMBOL property in dump debugging of Kconfig

 - correct help message of LD_DEAD_CODE_DATA_ELIMINATION

 - fix occasional segmentation faults in Kconfig

* tag 'kbuild-fixes-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kconfig: loop boundary condition fix
  kbuild: reword help of LD_DEAD_CODE_DATA_ELIMINATION
  kconfig: handle P_SYMBOL in print_symbol()
  kconfig: document Kconfig source file comments
  kconfig: fix line numbers for if-entries in menu tree
  stack-protector: Fix test with 32-bit userland and CONFIG_64BIT=y
  powerpc: Remove -Wattribute-alias pragmas
  disable -Wattribute-alias warning for SYSCALL_DEFINEx()
  kbuild: add macro for controlling warnings to linux/compiler.h
parents 0fbc4aea 73d1c580

Documentation/kbuild/kconfig-language.txt

+6 −0
Original line number Diff line number Diff line
@@ -430,6 +430,12 @@ This sets the config program's title bar if the config program chooses 
to use it. It should be placed at the top of the configuration, before any

other statement.



'#' Kconfig source file comment:



An unquoted '#' character anywhere in a source file line indicates

the beginning of a source file comment.  The remainder of that line

is a comment.





Kconfig hints

-------------

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