Expand INIT_STRUCT_PID and remove

Expand INIT_STRUCT_PID in the single place that uses it and then remove it.
There doesn't seem any point in the macro.

Signed-off-by: David Howells <dhowells@redhat.com>
Tested-by: Tony Luck <tony.luck@intel.com>
Tested-by: Will Deacon <will.deacon@arm.com> (arm64)
Tested-by: Palmer Dabbelt <palmer@sifive.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
David Howells 2018-01-02 15:12:01 +00:00
parent 3678e2fcc2
commit e1e871aff3
2 changed files with 13 additions and 16 deletions

View File

@ -46,21 +46,6 @@ extern struct cred init_cred;
#define INIT_CPU_TIMERS(s)
#endif
#define INIT_STRUCT_PID { \
.count = ATOMIC_INIT(1), \
.tasks = { \
{ .first = NULL }, \
{ .first = NULL }, \
{ .first = NULL }, \
}, \
.level = 0, \
.numbers = { { \
.nr = 0, \
.ns = &init_pid_ns, \
}, } \
}
#define INIT_PID_LINK(type) \
{ \
.node = { \

View File

@ -41,7 +41,19 @@
#include <linux/sched/task.h>
#include <linux/idr.h>
struct pid init_struct_pid = INIT_STRUCT_PID;
struct pid init_struct_pid = {
.count = ATOMIC_INIT(1),
.tasks = {
{ .first = NULL },
{ .first = NULL },
{ .first = NULL },
},
.level = 0,
.numbers = { {
.nr = 0,
.ns = &init_pid_ns,
}, }
};
int pid_max = PID_MAX_DEFAULT;