You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge branch 'akpm' (patches from Andrew)
Merge more updates from Andrew Morton: - the rest of MM - procfs updates - various misc things - more y2038 fixes - get_maintainer updates - lib/ updates - checkpatch updates - various epoll updates - autofs updates - hfsplus - some reiserfs work - fatfs updates - signal.c cleanups - ipc/ updates * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (166 commits) ipc/util.c: update return value of ipc_getref from int to bool ipc/util.c: further variable name cleanups ipc: simplify ipc initialization ipc: get rid of ids->tables_initialized hack lib/rhashtable: guarantee initial hashtable allocation lib/rhashtable: simplify bucket_table_alloc() ipc: drop ipc_lock() ipc/util.c: correct comment in ipc_obtain_object_check ipc: rename ipcctl_pre_down_nolock() ipc/util.c: use ipc_rcu_putref() for failues in ipc_addid() ipc: reorganize initialization of kern_ipc_perm.seq ipc: compute kern_ipc_perm.id under the ipc lock init/Kconfig: remove EXPERT from CHECKPOINT_RESTORE fs/sysv/inode.c: use ktime_get_real_seconds() for superblock stamp adfs: use timespec64 for time conversion kernel/sysctl.c: fix typos in comments drivers/rapidio/devices/rio_mport_cdev.c: remove redundant pointer md fork: don't copy inconsistent signal handler state to child signal: make get_signal() return bool signal: make sigkill_pending() return bool ...
This commit is contained in:
+14
-14
@@ -436,7 +436,7 @@ config BSD_PROCESS_ACCT_V3
|
||||
help
|
||||
If you say Y here, the process accounting information is written
|
||||
in a new file format that also logs the process IDs of each
|
||||
process and it's parent. Note that this file format is incompatible
|
||||
process and its parent. Note that this file format is incompatible
|
||||
with previous v0/v1/v2 file formats, so you will need updated tools
|
||||
for processing it. A preliminary version of these tools is available
|
||||
at <http://www.gnu.org/software/acct/>.
|
||||
@@ -967,6 +967,18 @@ config NET_NS
|
||||
|
||||
endif # NAMESPACES
|
||||
|
||||
config CHECKPOINT_RESTORE
|
||||
bool "Checkpoint/restore support"
|
||||
select PROC_CHILDREN
|
||||
default n
|
||||
help
|
||||
Enables additional kernel features in a sake of checkpoint/restore.
|
||||
In particular it adds auxiliary prctl codes to setup process text,
|
||||
data and heap segment sizes, and a few additional /proc filesystem
|
||||
entries.
|
||||
|
||||
If unsure, say N here.
|
||||
|
||||
config SCHED_AUTOGROUP
|
||||
bool "Automatic process group scheduling"
|
||||
select CGROUPS
|
||||
@@ -1383,18 +1395,6 @@ config MEMBARRIER
|
||||
|
||||
If unsure, say Y.
|
||||
|
||||
config CHECKPOINT_RESTORE
|
||||
bool "Checkpoint/restore support" if EXPERT
|
||||
select PROC_CHILDREN
|
||||
default n
|
||||
help
|
||||
Enables additional kernel features in a sake of checkpoint/restore.
|
||||
In particular it adds auxiliary prctl codes to setup process text,
|
||||
data and heap segment sizes, and a few additional /proc filesystem
|
||||
entries.
|
||||
|
||||
If unsure, say N here.
|
||||
|
||||
config KALLSYMS
|
||||
bool "Load all symbols for debugging/ksymoops" if EXPERT
|
||||
default y
|
||||
@@ -1702,7 +1702,7 @@ config MMAP_ALLOW_UNINITIALIZED
|
||||
default n
|
||||
help
|
||||
Normally, and according to the Linux spec, anonymous memory obtained
|
||||
from mmap() has it's contents cleared before it is passed to
|
||||
from mmap() has its contents cleared before it is passed to
|
||||
userspace. Enabling this config option allows you to request that
|
||||
mmap() skip that if it is given an MAP_UNINITIALIZED flag, thus
|
||||
providing a huge performance boost. If this option is not enabled,
|
||||
|
||||
@@ -1,13 +1,3 @@
|
||||
/*
|
||||
* Many of the syscalls used in this file expect some of the arguments
|
||||
* to be __user pointers not __kernel pointers. To limit the sparse
|
||||
* noise, turn off sparse checking for this file.
|
||||
*/
|
||||
#ifdef __CHECKER__
|
||||
#undef __CHECKER__
|
||||
#warning "Sparse checking disabled for this file"
|
||||
#endif
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/ctype.h>
|
||||
|
||||
@@ -1,14 +1,4 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
/*
|
||||
* Many of the syscalls used in this file expect some of the arguments
|
||||
* to be __user pointers not __kernel pointers. To limit the sparse
|
||||
* noise, turn off sparse checking for this file.
|
||||
*/
|
||||
#ifdef __CHECKER__
|
||||
#undef __CHECKER__
|
||||
#warning "Sparse checking disabled for this file"
|
||||
#endif
|
||||
|
||||
#include <linux/unistd.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/fs.h>
|
||||
|
||||
@@ -1,14 +1,4 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
/*
|
||||
* Many of the syscalls used in this file expect some of the arguments
|
||||
* to be __user pointers not __kernel pointers. To limit the sparse
|
||||
* noise, turn off sparse checking for this file.
|
||||
*/
|
||||
#ifdef __CHECKER__
|
||||
#undef __CHECKER__
|
||||
#warning "Sparse checking disabled for this file"
|
||||
#endif
|
||||
|
||||
#include <linux/delay.h>
|
||||
#include <linux/raid/md_u.h>
|
||||
#include <linux/raid/md_p.h>
|
||||
|
||||
@@ -1,14 +1,4 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
/*
|
||||
* Many of the syscalls used in this file expect some of the arguments
|
||||
* to be __user pointers not __kernel pointers. To limit the sparse
|
||||
* noise, turn off sparse checking for this file.
|
||||
*/
|
||||
#ifdef __CHECKER__
|
||||
#undef __CHECKER__
|
||||
#warning "Sparse checking disabled for this file"
|
||||
#endif
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/minix_fs.h>
|
||||
|
||||
@@ -1,14 +1,4 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
/*
|
||||
* Many of the syscalls used in this file expect some of the arguments
|
||||
* to be __user pointers not __kernel pointers. To limit the sparse
|
||||
* noise, turn off sparse checking for this file.
|
||||
*/
|
||||
#ifdef __CHECKER__
|
||||
#undef __CHECKER__
|
||||
#warning "Sparse checking disabled for this file"
|
||||
#endif
|
||||
|
||||
#include <linux/init.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
+16
-15
@@ -902,18 +902,18 @@ int __init_or_module do_one_initcall(initcall_t fn)
|
||||
}
|
||||
|
||||
|
||||
extern initcall_t __initcall_start[];
|
||||
extern initcall_t __initcall0_start[];
|
||||
extern initcall_t __initcall1_start[];
|
||||
extern initcall_t __initcall2_start[];
|
||||
extern initcall_t __initcall3_start[];
|
||||
extern initcall_t __initcall4_start[];
|
||||
extern initcall_t __initcall5_start[];
|
||||
extern initcall_t __initcall6_start[];
|
||||
extern initcall_t __initcall7_start[];
|
||||
extern initcall_t __initcall_end[];
|
||||
extern initcall_entry_t __initcall_start[];
|
||||
extern initcall_entry_t __initcall0_start[];
|
||||
extern initcall_entry_t __initcall1_start[];
|
||||
extern initcall_entry_t __initcall2_start[];
|
||||
extern initcall_entry_t __initcall3_start[];
|
||||
extern initcall_entry_t __initcall4_start[];
|
||||
extern initcall_entry_t __initcall5_start[];
|
||||
extern initcall_entry_t __initcall6_start[];
|
||||
extern initcall_entry_t __initcall7_start[];
|
||||
extern initcall_entry_t __initcall_end[];
|
||||
|
||||
static initcall_t *initcall_levels[] __initdata = {
|
||||
static initcall_entry_t *initcall_levels[] __initdata = {
|
||||
__initcall0_start,
|
||||
__initcall1_start,
|
||||
__initcall2_start,
|
||||
@@ -939,7 +939,7 @@ static char *initcall_level_names[] __initdata = {
|
||||
|
||||
static void __init do_initcall_level(int level)
|
||||
{
|
||||
initcall_t *fn;
|
||||
initcall_entry_t *fn;
|
||||
|
||||
strcpy(initcall_command_line, saved_command_line);
|
||||
parse_args(initcall_level_names[level],
|
||||
@@ -950,7 +950,7 @@ static void __init do_initcall_level(int level)
|
||||
|
||||
trace_initcall_level(initcall_level_names[level]);
|
||||
for (fn = initcall_levels[level]; fn < initcall_levels[level+1]; fn++)
|
||||
do_one_initcall(*fn);
|
||||
do_one_initcall(initcall_from_entry(fn));
|
||||
}
|
||||
|
||||
static void __init do_initcalls(void)
|
||||
@@ -981,11 +981,11 @@ static void __init do_basic_setup(void)
|
||||
|
||||
static void __init do_pre_smp_initcalls(void)
|
||||
{
|
||||
initcall_t *fn;
|
||||
initcall_entry_t *fn;
|
||||
|
||||
trace_initcall_level("early");
|
||||
for (fn = __initcall_start; fn < __initcall0_start; fn++)
|
||||
do_one_initcall(*fn);
|
||||
do_one_initcall(initcall_from_entry(fn));
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1002,6 +1002,7 @@ void __init load_default_modules(void)
|
||||
static int run_init_process(const char *init_filename)
|
||||
{
|
||||
argv_init[0] = init_filename;
|
||||
pr_info("Run %s as init process\n", init_filename);
|
||||
return do_execve(getname_kernel(init_filename),
|
||||
(const char __user *const __user *)argv_init,
|
||||
(const char __user *const __user *)envp_init);
|
||||
|
||||
Reference in New Issue
Block a user