diff options
| author | Linus Torvalds | 2011-05-22 21:38:40 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2011-05-22 21:38:40 +0200 |
| commit | 17238005f377888b9d4583835205c77e3d781bb8 (patch) | |
| tree | 9cad40902138d08a2694f87736cfebd031dc9542 /arch/parisc/kernel/vmlinux.lds.S | |
| parent | net: add missing prefetch.h include (diff) | |
| parent | Merge branch 'flushing' into for-linus (diff) | |
| download | kernel-qcow2-linux-17238005f377888b9d4583835205c77e3d781bb8.tar.gz kernel-qcow2-linux-17238005f377888b9d4583835205c77e3d781bb8.tar.xz kernel-qcow2-linux-17238005f377888b9d4583835205c77e3d781bb8.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
[PARISC] wire up syncfs syscall
[PARISC] wire up the fhandle syscalls
[PARISC] wire up clock_adjtime syscall
[PARISC] wire up fanotify syscalls
[PARISC] prevent speculative re-read on cache flush
[PARISC] only make executable areas executable
[PARISC] fix pacache .size with new binutils
Diffstat (limited to 'arch/parisc/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/parisc/kernel/vmlinux.lds.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S index 2d9a5c7c76f5..e1a55849bfa7 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S @@ -137,6 +137,7 @@ SECTIONS . = ALIGN(16384); __init_begin = .; INIT_TEXT_SECTION(16384) + . = ALIGN(PAGE_SIZE); INIT_DATA_SECTION(16) /* we have to discard exit text and such at runtime, not link time */ .exit.text : |