diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/m32r/kernel/vmlinux.lds.S | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/m32r/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/m32r/kernel/vmlinux.lds.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S index 7da94eaa082b..018e4a711d79 100644 --- a/arch/m32r/kernel/vmlinux.lds.S +++ b/arch/m32r/kernel/vmlinux.lds.S | |||
| @@ -44,6 +44,7 @@ SECTIONS | |||
| 44 | EXCEPTION_TABLE(16) | 44 | EXCEPTION_TABLE(16) |
| 45 | NOTES | 45 | NOTES |
| 46 | 46 | ||
| 47 | _sdata = .; /* Start of data section */ | ||
| 47 | RODATA | 48 | RODATA |
| 48 | RW_DATA_SECTION(32, PAGE_SIZE, THREAD_SIZE) | 49 | RW_DATA_SECTION(32, PAGE_SIZE, THREAD_SIZE) |
| 49 | _edata = .; /* End of data section */ | 50 | _edata = .; /* End of data section */ |
| @@ -53,7 +54,7 @@ SECTIONS | |||
| 53 | __init_begin = .; | 54 | __init_begin = .; |
| 54 | INIT_TEXT_SECTION(PAGE_SIZE) | 55 | INIT_TEXT_SECTION(PAGE_SIZE) |
| 55 | INIT_DATA_SECTION(16) | 56 | INIT_DATA_SECTION(16) |
| 56 | PERCPU(PAGE_SIZE) | 57 | PERCPU_SECTION(32) |
| 57 | . = ALIGN(PAGE_SIZE); | 58 | . = ALIGN(PAGE_SIZE); |
| 58 | __init_end = .; | 59 | __init_end = .; |
| 59 | /* freed after init ends here */ | 60 | /* freed after init ends here */ |