diff options
| author | James Morris | 2008-12-04 07:16:36 +0100 |
|---|---|---|
| committer | James Morris | 2008-12-04 07:16:36 +0100 |
| commit | ec98ce480ada787f2cfbd696980ff3564415505b (patch) | |
| tree | 1a4d644b38f9f1e4b4e086fde0b195df4a92cf84 /arch/m32r/kernel/vmlinux.lds.S | |
| parent | Merge branch 'serge-next' into next (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
| download | kernel-qcow2-linux-ec98ce480ada787f2cfbd696980ff3564415505b.tar.gz kernel-qcow2-linux-ec98ce480ada787f2cfbd696980ff3564415505b.tar.xz kernel-qcow2-linux-ec98ce480ada787f2cfbd696980ff3564415505b.zip | |
Merge branch 'master' into next
Conflicts:
fs/nfsd/nfs4recover.c
Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'arch/m32r/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/m32r/kernel/vmlinux.lds.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S index 15a6f36c06db..9db05df20c0e 100644 --- a/arch/m32r/kernel/vmlinux.lds.S +++ b/arch/m32r/kernel/vmlinux.lds.S @@ -27,6 +27,7 @@ SECTIONS _text = .; /* Text and read-only data */ .boot : { *(.boot) } = 0 .text : { + *(.text.head) TEXT_TEXT SCHED_TEXT LOCK_TEXT |