diff options
| author | James Morris <jmorris@namei.org> | 2008-12-04 01:16:36 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-12-04 01:16:36 -0500 |
| commit | ec98ce480ada787f2cfbd696980ff3564415505b (patch) | |
| tree | 1a4d644b38f9f1e4b4e086fde0b195df4a92cf84 /arch/sparc/kernel/head.S | |
| parent | 3496f92beb9aa99ef21fccc154a36c7698e9c538 (diff) | |
| parent | feaf3848a813a106f163013af6fcf6c4bfec92d9 (diff) | |
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/sparc/kernel/head.S')
| -rw-r--r-- | arch/sparc/kernel/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/head.S b/arch/sparc/kernel/head.S index 2d325fd84579..51b40426f9c6 100644 --- a/arch/sparc/kernel/head.S +++ b/arch/sparc/kernel/head.S | |||
| @@ -72,7 +72,7 @@ sun4e_notsup: | |||
| 72 | .align 4 | 72 | .align 4 |
| 73 | 73 | ||
| 74 | /* The Sparc trap table, bootloader gives us control at _start. */ | 74 | /* The Sparc trap table, bootloader gives us control at _start. */ |
| 75 | .text | 75 | .section .text.head,"ax" |
| 76 | .globl start, _stext, _start, __stext | 76 | .globl start, _stext, _start, __stext |
| 77 | .globl trapbase | 77 | .globl trapbase |
| 78 | _start: /* danger danger */ | 78 | _start: /* danger danger */ |