diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-09 11:52:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-09 11:52:48 -0700 |
| commit | f16393776fc133d95fe3b3ba7118df579ed90af5 (patch) | |
| tree | e68d277816962511fa873e658e463948def02c3d /arch/s390/kernel/early.c | |
| parent | 2f4084209adc77f9a1c9f38db3019a509e167882 (diff) | |
| parent | 8e7fcccee990acd8135db447ad01cb3b22bce620 (diff) | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] Update default configuration.
[S390] nss: add missing .previous statement to asm function
[S390] increase default size of vmalloc area
[S390] s390: disable change bit override
[S390] fix io_return critical section cleanup
[S390] sclp_async: potential buffer overflow
[S390] arch/s390/kernel: Add missing unlock
Diffstat (limited to 'arch/s390/kernel/early.c')
| -rw-r--r-- | arch/s390/kernel/early.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c index 31d618a443a..2d92c2cf92d 100644 --- a/arch/s390/kernel/early.c +++ b/arch/s390/kernel/early.c @@ -82,7 +82,8 @@ asm( " lm 6,15,24(15)\n" #endif " br 14\n" - " .size savesys_ipl_nss, .-savesys_ipl_nss\n"); + " .size savesys_ipl_nss, .-savesys_ipl_nss\n" + " .previous\n"); static __initdata char upper_command_line[COMMAND_LINE_SIZE]; |