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

Commit e7489622 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 

Pull arm64 fixes from Catalin Marinas:

 - Fix !SMP build error.

 - Fix padding computation in struct ucontext (no ABI change).

 - Minor clean-up after the signal patches (unused var).

 - Two old Kconfig options clean-up.

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
  arm64: Kconfig.debug: Remove unused CONFIG_DEBUG_ERRORS
  arm64: Do not select GENERIC_HARDIRQS_NO_DEPRECATED
  arm64: fix padding computation in struct ucontext
  arm64: Fix build error with !SMP
  arm64: Removed unused variable in compat_setup_rt_frame()
parents 7b1b3fd7 79207206

arch/arm64/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ config ARM64 
	select CLONE_BACKWARDS

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select GENERIC_HARDIRQS_NO_DEPRECATED

	select GENERIC_IOMAP

	select GENERIC_IRQ_PROBE

	select GENERIC_IRQ_SHOW

arch/arm64/Kconfig.debug

+0 −11
Original line number Diff line number Diff line
@@ -6,17 +6,6 @@ config FRAME_POINTER 
	bool

	default y



config DEBUG_ERRORS

	bool "Verbose kernel error messages"

	depends on DEBUG_KERNEL

	help

	  This option controls verbose debugging information which can be

	  printed when the kernel detects an internal error. This debugging

	  information is useful to kernel hackers when tracking down problems,

	  but mostly meaningless to other people. It's safe to say Y unless

	  you are concerned with the code size or don't want to see these

	  messages.



config DEBUG_STACK_USAGE

	bool "Enable stack utilization instrumentation"

	depends on DEBUG_KERNEL

arch/arm64/configs/defconfig

+0 −1
Original line number Diff line number Diff line
@@ -82,4 +82,3 @@ CONFIG_DEBUG_KERNEL=y 
CONFIG_DEBUG_INFO=y

# CONFIG_FTRACE is not set

CONFIG_ATOMIC64_SELFTEST=y
 
CONFIG_DEBUG_ERRORS=y

arch/arm64/include/asm/ucontext.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ struct ucontext { 
	stack_t		  uc_stack;

	sigset_t	  uc_sigmask;

	/* glibc uses a 1024-bit sigset_t */

	__u8		  __unused[(1024 - sizeof(sigset_t)) / 8];

	__u8		  __unused[1024 / 8 - sizeof(sigset_t)];

	/* last for future expansion */

	struct sigcontext uc_mcontext;

};

arch/arm64/kernel/arm64ksyms.c

+2 −0
Original line number Diff line number Diff line
@@ -40,7 +40,9 @@ EXPORT_SYMBOL(__copy_to_user); 
EXPORT_SYMBOL(__clear_user);



	/* bitops */

#ifdef CONFIG_SMP

EXPORT_SYMBOL(__atomic_hash);

#endif



	/* physical memory */

EXPORT_SYMBOL(memstart_addr);