Commit e7489622 authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -9,7 +9,6 @@ config ARM64 ...@@ -9,7 +9,6 @@ config ARM64
select CLONE_BACKWARDS select CLONE_BACKWARDS
select COMMON_CLK select COMMON_CLK
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select GENERIC_HARDIRQS_NO_DEPRECATED
select GENERIC_IOMAP select GENERIC_IOMAP
select GENERIC_IRQ_PROBE select GENERIC_IRQ_PROBE
select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW
......
...@@ -6,17 +6,6 @@ config FRAME_POINTER ...@@ -6,17 +6,6 @@ config FRAME_POINTER
bool bool
default y 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 config DEBUG_STACK_USAGE
bool "Enable stack utilization instrumentation" bool "Enable stack utilization instrumentation"
depends on DEBUG_KERNEL depends on DEBUG_KERNEL
......
...@@ -82,4 +82,3 @@ CONFIG_DEBUG_KERNEL=y ...@@ -82,4 +82,3 @@ CONFIG_DEBUG_KERNEL=y
CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INFO=y
# CONFIG_FTRACE is not set # CONFIG_FTRACE is not set
CONFIG_ATOMIC64_SELFTEST=y CONFIG_ATOMIC64_SELFTEST=y
CONFIG_DEBUG_ERRORS=y
...@@ -22,7 +22,7 @@ struct ucontext { ...@@ -22,7 +22,7 @@ struct ucontext {
stack_t uc_stack; stack_t uc_stack;
sigset_t uc_sigmask; sigset_t uc_sigmask;
/* glibc uses a 1024-bit sigset_t */ /* 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 */ /* last for future expansion */
struct sigcontext uc_mcontext; struct sigcontext uc_mcontext;
}; };
......
...@@ -40,7 +40,9 @@ EXPORT_SYMBOL(__copy_to_user); ...@@ -40,7 +40,9 @@ EXPORT_SYMBOL(__copy_to_user);
EXPORT_SYMBOL(__clear_user); EXPORT_SYMBOL(__clear_user);
/* bitops */ /* bitops */
#ifdef CONFIG_SMP
EXPORT_SYMBOL(__atomic_hash); EXPORT_SYMBOL(__atomic_hash);
#endif
/* physical memory */ /* physical memory */
EXPORT_SYMBOL(memstart_addr); EXPORT_SYMBOL(memstart_addr);
...@@ -549,7 +549,6 @@ int compat_setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info, ...@@ -549,7 +549,6 @@ int compat_setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
sigset_t *set, struct pt_regs *regs) sigset_t *set, struct pt_regs *regs)
{ {
struct compat_rt_sigframe __user *frame; struct compat_rt_sigframe __user *frame;
compat_stack_t stack;
int err = 0; int err = 0;
frame = compat_get_sigframe(ka, regs, sizeof(*frame)); frame = compat_get_sigframe(ka, regs, sizeof(*frame));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment