Consolidate init_mm definition
Subsystems (14)
PATCH 1/1 Consolidate init_mm definition
* create mm/init-mm.c, move init_mm there
* remove INIT_MM, initialize init_mm with C99 initializer
* unexport init_mm on all arches:
init_mm is already unexported on x86.
One strange place is some OMAP driver (drivers/video/omap/) which won't build modular, but it's already wants get_vm_area() export. Somebody should look there.
---
arch/alpha/kernel/init_task.c | 3 --- arch/arm/kernel/init_task.c | 4 ---- arch/avr32/kernel/init_task.c | 4 ---- arch/blackfin/kernel/init_task.c | 4 ---- arch/cris/kernel/process.c | 4 ---- arch/frv/kernel/init_task.c | 4 ---- arch/h8300/kernel/init_task.c | 4 ---- arch/ia64/kernel/init_task.c | 4 ---- arch/m32r/kernel/init_task.c | 4 ---- arch/m68k/kernel/process.c | 4 ---- arch/m68knommu/kernel/init_task.c | 4 ---- arch/mips/kernel/init_task.c | 4 ---- arch/mn10300/kernel/init_task.c | 3 --- arch/parisc/kernel/init_task.c | 4 ---- arch/powerpc/kernel/init_task.c | 4 ---- arch/s390/kernel/init_task.c | 4 ---- arch/sh/kernel/init_task.c | 3 --- arch/sparc/kernel/init_task.c | 3 --- arch/um/kernel/init_task.c | 3 --- arch/x86/kernel/init_task.c | 1 - arch/xtensa/kernel/init_task.c | 4 ---- include/linux/init_task.h | 12 ------------ mm/Makefile | 1 + mm/init-mm.c | 13 +++++++++++++ 24 files changed, 14 insertions(+), 88 deletions(-)
arch/alpha/kernel/init_task.c +0 -3
@@ -10,10 +10,7 @@static struct signal_struct init_signals =INIT_SIGNALS (init_signals);static struct sighand_struct init_sighand =INIT_SIGHAND (init_sighand); -struct mm_struct init_mm =INIT_MM (init_mm);struct task_struct init_task =INIT_TASK (init_task); - -EXPORT_SYMBOL (init_mm);EXPORT_SYMBOL (init_task);union thread_union init_thread_union
arch/arm/kernel/init_task.c +0 -4
@@ -14,10 +14,6 @@static struct signal_struct init_signals =INIT_SIGNALS (init_signals);static struct sighand_struct init_sighand =INIT_SIGHAND (init_sighand); -struct mm_struct init_mm =INIT_MM (init_mm); - -EXPORT_SYMBOL (init_mm); -/* * Initial thread structure. *
arch/avr32/kernel/init_task.c +0 -4
@@ -15,10 +15,6 @@static struct signal_struct init_signals =INIT_SIGNALS (init_signals);static struct sighand_struct init_sighand =INIT_SIGHAND (init_sighand); -struct mm_struct init_mm =INIT_MM (init_mm); - -EXPORT_SYMBOL (init_mm); -/* * Initial thread structure. Must be aligned on an 8192-byte boundary. */
arch/blackfin/kernel/init_task.c +0 -4
@@ -35,10 +35,6 @@static struct signal_struct init_signals =INIT_SIGNALS (init_signals);static struct sighand_struct init_sighand =INIT_SIGHAND (init_sighand); - -struct mm_struct init_mm =INIT_MM (init_mm); -EXPORT_SYMBOL (init_mm); -/* * Initial task structure. *
arch/cris/kernel/process.c +0 -4
@@ -39,10 +39,6 @@static struct signal_struct init_signals =INIT_SIGNALS (init_signals);static struct sighand_struct init_sighand =INIT_SIGHAND (init_sighand); -struct mm_struct init_mm =INIT_MM (init_mm); - -EXPORT_SYMBOL (init_mm); -/* * Initial thread structure. *
arch/frv/kernel/init_task.c +0 -4
@@ -12,10 +12,6 @@static struct signal_struct init_signals =INIT_SIGNALS (init_signals);static struct sighand_struct init_sighand =INIT_SIGHAND (init_sighand); -struct mm_struct init_mm =INIT_MM (init_mm); - -EXPORT_SYMBOL (init_mm); -/* * Initial thread structure. *
arch/h8300/kernel/init_task.c +0 -4
@@ -14,10 +14,6 @@static struct signal_struct init_signals =INIT_SIGNALS (init_signals);static struct sighand_struct init_sighand =INIT_SIGHAND (init_sighand); -struct mm_struct init_mm =INIT_MM (init_mm); - -EXPORT_SYMBOL (init_mm); -/* * Initial task structure. *
arch/ia64/kernel/init_task.c +0 -4
@@ -19,10 +19,6 @@static struct signal_struct init_signals =INIT_SIGNALS (init_signals);static struct sighand_struct init_sighand =INIT_SIGHAND (init_sighand); -struct mm_struct init_mm =INIT_MM (init_mm); - -EXPORT_SYMBOL (init_mm); -/* * Initial task structure. *
arch/m32r/kernel/init_task.c +0 -4
@@ -13,10 +13,6 @@static struct signal_struct init_signals =INIT_SIGNALS (init_signals);static struct sighand_struct init_sighand =INIT_SIGHAND (init_sighand); -struct mm_struct init_mm =INIT_MM (init_mm); - -EXPORT_SYMBOL (init_mm); -/* * Initial thread structure. *
arch/m68k/kernel/process.c +0 -4
@@ -42,10 +42,6 @@*/ static struct signal_struct init_signals =INIT_SIGNALS (init_signals);static struct sighand_struct init_sighand =INIT_SIGHAND (init_sighand); -struct mm_struct init_mm =INIT_MM (init_mm); - -EXPORT_SYMBOL (init_mm); - union thread_union init_thread_union __attribute__((section(".data.init_task"), aligned(THREAD_SIZE))) = { INIT_THREAD_INFO(init_task) };
arch/m68knommu/kernel/init_task.c +0 -4
@@ -14,10 +14,6 @@static struct signal_struct init_signals =INIT_SIGNALS (init_signals);static struct sighand_struct init_sighand =INIT_SIGHAND (init_sighand); -struct mm_struct init_mm =INIT_MM (init_mm); - -EXPORT_SYMBOL (init_mm); -/* * Initial task structure. *
arch/mips/kernel/init_task.c +0 -4
@@ -11,10 +11,6 @@static struct signal_struct init_signals =INIT_SIGNALS (init_signals);static struct sighand_struct init_sighand =INIT_SIGHAND (init_sighand); -struct mm_struct init_mm =INIT_MM (init_mm); - -EXPORT_SYMBOL (init_mm); -/* * Initial thread structure. *
arch/mn10300/kernel/init_task.c +0 -3
@@ -20,9 +20,6 @@static struct signal_struct init_signals =INIT_SIGNALS (init_signals);static struct sighand_struct init_sighand =INIT_SIGHAND (init_sighand); -struct mm_struct init_mm =INIT_MM (init_mm); -EXPORT_SYMBOL (init_mm); -/* * Initial thread structure. *
arch/parisc/kernel/init_task.c +0 -4
@@ -36,10 +36,6 @@static struct signal_struct init_signals =INIT_SIGNALS (init_signals);static struct sighand_struct init_sighand =INIT_SIGHAND (init_sighand); -struct mm_struct init_mm =INIT_MM (init_mm); - -EXPORT_SYMBOL (init_mm); -/* * Initial task structure. *
arch/powerpc/kernel/init_task.c +0 -4
@@ -9,10 +9,6 @@static struct signal_struct init_signals =INIT_SIGNALS (init_signals);static struct sighand_struct init_sighand =INIT_SIGHAND (init_sighand); -struct mm_struct init_mm =INIT_MM (init_mm); - -EXPORT_SYMBOL (init_mm); -/* * Initial thread structure. *
arch/s390/kernel/init_task.c +0 -4
@@ -18,10 +18,6 @@static struct signal_struct init_signals =INIT_SIGNALS (init_signals);static struct sighand_struct init_sighand =INIT_SIGHAND (init_sighand); -struct mm_struct init_mm =INIT_MM (init_mm); - -EXPORT_SYMBOL (init_mm); -/* * Initial thread structure. *
arch/sh/kernel/init_task.c +0 -3
@@ -10,9 +10,6 @@static struct signal_struct init_signals =INIT_SIGNALS (init_signals);static struct sighand_struct init_sighand =INIT_SIGHAND (init_sighand);struct pt_regs fake_swapper_regs; -struct mm_struct init_mm =INIT_MM (init_mm); -EXPORT_SYMBOL (init_mm); -/* * Initial thread structure. *
arch/sparc/kernel/init_task.c +0 -3
@@ -10,10 +10,7 @@static struct signal_struct init_signals =INIT_SIGNALS (init_signals);static struct sighand_struct init_sighand =INIT_SIGHAND (init_sighand); -struct mm_struct init_mm =INIT_MM (init_mm);struct task_struct init_task =INIT_TASK (init_task); - -EXPORT_SYMBOL (init_mm);EXPORT_SYMBOL (init_task);/* .text section in head.S is aligned at 8k boundary and this gets linked
arch/um/kernel/init_task.c +0 -3
@@ -10,11 +10,8 @@#include "linux/mqueue.h" #include "asm/uaccess.h" -struct mm_struct init_mm =INIT_MM (init_mm);static struct signal_struct init_signals =INIT_SIGNALS (init_signals);static struct sighand_struct init_sighand =INIT_SIGHAND (init_sighand); -EXPORT_SYMBOL (init_mm); -/* * Initial task structure. *
arch/x86/kernel/init_task.c +0 -1
@@ -12,7 +12,6 @@static struct signal_struct init_signals =INIT_SIGNALS (init_signals);static struct sighand_struct init_sighand =INIT_SIGHAND (init_sighand); -struct mm_struct init_mm =INIT_MM (init_mm);/* * Initial thread structure.
arch/xtensa/kernel/init_task.c +0 -4
@@ -23,10 +23,6 @@static struct signal_struct init_signals =INIT_SIGNALS (init_signals);static struct sighand_struct init_sighand =INIT_SIGHAND (init_sighand); -struct mm_struct init_mm =INIT_MM (init_mm); - -EXPORT_SYMBOL (init_mm); - union thread_union init_thread_union __attribute__((__section__(".data.init_task"))) = { INIT_THREAD_INFO(init_task) };
include/linux/init_task.h +0 -12
@@ -14,18 +14,6 @@extern struct files_struct init_files;extern struct fs_struct init_fs; -#define INIT_MM (name) \ -{ \ - .mm_rb = RB_ROOT, \ - .pgd = swapper_pg_dir, \ - .mm_users = ATOMIC_INIT(2), \ - .mm_count = ATOMIC_INIT(1), \ - .mmap_sem = __RWSEM_INITIALIZER(name.mmap_sem), \ - .page_table_lock = __SPIN_LOCK_UNLOCKED(name.page_table_lock), \ - .mmlist = LIST_HEAD_INIT(name.mmlist), \ - .cpu_vm_mask = CPU_MASK_ALL, \ -} -#define INIT_SIGNALS (sig) { \ .count = ATOMIC_INIT(1), \ .wait_chldexit = __WAIT_QUEUE_HEAD_INITIALIZER(sig.wait_chldexit),\
mm/Makefile +1 -0
@@ -12,6 +12,7 @@ obj-y := bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \ readahead.o swap.o truncate.o vmscan.o shmem.o \ prio_tree.o util.o mmzone.o vmstat.o backing-dev.o \ page_isolation.o mm_init.o $(mmu-y) +obj-y += init-mm.o obj-$(CONFIG_PROC_PAGE_MONITOR) += pagewalk.o obj-$(CONFIG_BOUNCE) += bounce.o
new file mode 100644
mm/init-mm.c new file +13 -0
@@ -0,0 +1,13 @@ +#include <linux/mm_types.h> +#include <asm/pgtable.h> + +struct mm_struct init_mm = { + .mm_rb =RB_ROOT , + .pgd = swapper_pg_dir, + .mm_users =ATOMIC_INIT (2 ), + .mm_count =ATOMIC_INIT (1 ), + .mmap_sem =__RWSEM_INITIALIZER (init_mm.mmap_sem), + .page_table_lock =__SPIN_LOCK_UNLOCKED (init_mm.page_table_lock), + .mmlist =LIST_HEAD_INIT (init_mm.mmlist), + .cpu_vm_mask =CPU_MASK_ALL , +};
mm/init-mm.c line 2
Quoted 6 lines · Alexey Dobriyan
new file mode 100644
mm/init-mm.c new file +2
-0@@ -0,0 +1,13 @@ +#include <linux/mm_types.h> +#include <asm/pgtable.h>
shouldnt there be a short license blurb ?
/* Licensed under the GPL-2 or later. */
-mike
Quoted 9 lines · Mike Frysinger
mm/init-mm.c line 2
Quoted 4 lines · Alexey Dobriyan
+++
b/mm/init-mm.cmm/init-mm.c new file +2
-0@@ -0,0 +1,13 @@ +#include <linux/mm_types.h> +#include <asm/pgtable.h> shouldnt there be a short license blurb ?
/* Licensed under the GPL-2 or later. */
-mike
Why should it be? Even more, kernel is under GNU GPL 2, not "or later".
Quoted 11 lines · Alexey Dobriyan
Quoted 8 lines · Mike Frysinger
mm/init-mm.c line 2
Quoted 4 lines · Alexey Dobriyan
+++
b/mm/init-mm.cmm/init-mm.c new file +2
-0@@ -0,0 +1,13 @@ +#include <linux/mm_types.h> +#include <asm/pgtable.h> shouldnt there be a short license blurb ?
/* Licensed under the GPL-2 or later. */Why should it be? Even more, kernel is under GNU GPL 2, not "or later".
my point was to put a blurb. i frankly dont care about the exact license used.
also, the entire kernel is not under GPL-2 only. some pieces are "or later" while others are a completely different license (BSD variant). -mike
Quoted 10 lines · Alexey Dobriyan
* create
mm/init-mm.c, moveinit_mmthere
* removeINIT_MM, initializeinit_mmwith C99 initializer
* unexportinit_mmon all arches:
init_mmis already unexported on x86.One strange place is some OMAP driver (
drivers/video/omap/) which won't build modular, but it's already wantsget_vm_area()export. Somebody should look there.
Nice patch!
I don't know if my reply is too late or not.
But, do we need a new C file just to hold the init_mm definition?
Thanks.
Signature · 1 line
Do what you love, f**k the rest! F**k the regulations!
Quoted 12 lines · Américo Wang
Quoted 10 lines · Alexey Dobriyan
* create
mm/init-mm.c, moveinit_mmthere
* removeINIT_MM, initializeinit_mmwith C99 initializer
* unexportinit_mmon all arches:
init_mmis already unexported on x86.One strange place is some OMAP driver (
drivers/video/omap/) which won't build modular, but it's already wantsget_vm_area()export. Somebody should look there.
Quoted 4 lines
Nice patch!
I don't know if my reply is too late or not.
But, do we need a new C file just to hold theinit_mmdefinition?
I dunno. I thought where could I stick it, and all files looked alien?
Andrew Morton
maintainerQuoted 6 lines · On Fri, 27 Mar 2009 02:51:16 +0300 Alexey Dobriyan <[email protected]> wrote:
mm/init-mm.c new file +3
-0@@ -0,0 +1,13 @@ +#include <linux/mm_types.h> +#include <asm/pgtable.h> +
mm/init-mm.c line 13
Quoted 10 lines
mm/init-mm.c new file +10
-0+struct mm_struct init_mm = { + .mm_rb =RB_ROOT , + .pgd = swapper_pg_dir, + .mm_users =ATOMIC_INIT (2 ), + .mm_count =ATOMIC_INIT (1 ), + .mmap_sem =__RWSEM_INITIALIZER (init_mm.mmap_sem), + .page_table_lock =__SPIN_LOCK_UNLOCKED (init_mm.page_table_lock), + .mmlist =LIST_HEAD_INIT (init_mm.mmlist), + .cpu_vm_mask =CPU_MASK_ALL , +};
I'd be more conmfortable if this file were to explicitly include the headers which it needs.
As it stands, variations in configs (especially different architectures) have a decent chance of breaking things.