diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-16 19:35:27 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-16 19:35:27 -0400 |
| commit | 05e34754518b6a90d5c392790c032575fab12d66 (patch) | |
| tree | 318d321262269eff585573ab2acf04a2ff2b65f4 /arch/arm/kernel/vmlinux.lds.S | |
| parent | bd1274dc005c2cee41771a7cc616f4709a6e6323 (diff) | |
| parent | b511d75d6150892e67c8ebfa9dc8eb37ebd02aa3 (diff) | |
Merge branch 'p2v' into devel
Conflicts:
arch/arm/kernel/module.c
arch/arm/mach-s5pv210/sleep.S
Diffstat (limited to 'arch/arm/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/arm/kernel/vmlinux.lds.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index 61462790757f..dfbb377e251d 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S | |||
| @@ -64,6 +64,10 @@ SECTIONS | |||
| 64 | __smpalt_end = .; | 64 | __smpalt_end = .; |
| 65 | #endif | 65 | #endif |
| 66 | 66 | ||
| 67 | __pv_table_begin = .; | ||
| 68 | *(.pv_table) | ||
| 69 | __pv_table_end = .; | ||
| 70 | |||
| 67 | INIT_SETUP(16) | 71 | INIT_SETUP(16) |
| 68 | 72 | ||
| 69 | INIT_CALLS | 73 | INIT_CALLS |