diff options
| author | Ishan Mittal <imittal@nvidia.com> | 2014-05-05 20:04:18 +0530 |
|---|---|---|
| committer | Ishan Mittal <imittal@nvidia.com> | 2014-05-05 22:39:37 -0700 |
| commit | 2667b986de4255c1c274d7f81d05364857dc37f8 (patch) | |
| tree | 77260fb448c5c9119bca6a186d49891899d04f59 /kernel | |
| parent | f63dd89bb4068f8a10b127bdb715c4a9b181c1fe (diff) | |
| parent | e73e8eafd7ba01bee7c12c0f2986c1fbd992f203 (diff) | |
Merge branch 'ARM64 Upstream' into rel-21
* ARM64 Upstream changes: (113 commits)
Bug 1494135
Change-Id: I2e7c054d5bd6f702115f0697693298480d83e0b4
Signed-off-by: Ishan Mittal <imittal@nvidia.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/Kconfig.hz | 2 | ||||
| -rw-r--r-- | kernel/signal.c | 2 | ||||
| -rw-r--r-- | kernel/smp.c | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz index 94fabd534b03..2a202a846757 100644 --- a/kernel/Kconfig.hz +++ b/kernel/Kconfig.hz @@ -55,4 +55,4 @@ config HZ default 1000 if HZ_1000 config SCHED_HRTICK - def_bool HIGH_RES_TIMERS && (!SMP || USE_GENERIC_SMP_HELPERS) + def_bool HIGH_RES_TIMERS diff --git a/kernel/signal.c b/kernel/signal.c index 50e41075ac77..5db8e47a89ff 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -2723,7 +2723,7 @@ COMPAT_SYSCALL_DEFINE2(rt_sigpending, compat_sigset_t __user *, uset, #ifndef HAVE_ARCH_COPY_SIGINFO_TO_USER -int copy_siginfo_to_user(siginfo_t __user *to, siginfo_t *from) +int copy_siginfo_to_user(siginfo_t __user *to, const siginfo_t *from) { int err; diff --git a/kernel/smp.c b/kernel/smp.c index 4dba0f7b72ad..5221ac677e60 100644 --- a/kernel/smp.c +++ b/kernel/smp.c @@ -15,7 +15,6 @@ #include "smpboot.h" -#ifdef CONFIG_USE_GENERIC_SMP_HELPERS enum { CSD_FLAG_LOCK = 0x01, }; @@ -470,7 +469,6 @@ int smp_call_function(smp_call_func_t func, void *info, int wait) return 0; } EXPORT_SYMBOL(smp_call_function); -#endif /* USE_GENERIC_SMP_HELPERS */ /* Setup configured maximum number of CPUs to activate */ unsigned int setup_max_cpus = NR_CPUS; |