diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-27 12:16:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-27 12:16:38 -0700 |
| commit | 760dcc6e1839e7ca82507698fb077d5d78b24964 (patch) | |
| tree | 7b6ea512ea8cebd1573a77b9ff17c0c8a9865ddd /arch/s390/kernel/early.c | |
| parent | 4897f1011aff7534b8e319404f7cd4028de7a453 (diff) | |
| parent | 8d406c6de2e67b5bae3c43b62b492c4ff63afb92 (diff) | |
| download | talos-op-linux-760dcc6e1839e7ca82507698fb077d5d78b24964.tar.gz talos-op-linux-760dcc6e1839e7ca82507698fb077d5d78b24964.zip | |
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] zcrypt: fix scheduling of hrtimer ap_poll_timer
[S390] vdso: clock_gettime of CLOCK_THREAD_CPUTIME_ID with noexec=on
[S390] vdso: fix per cpu area allocation
[S390] hibernation: fix register corruption on machine checks
[S390] hibernation: fix lowcore handling
Diffstat (limited to 'arch/s390/kernel/early.c')
| -rw-r--r-- | arch/s390/kernel/early.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c index f9b144049dc9..8d15314381e0 100644 --- a/arch/s390/kernel/early.c +++ b/arch/s390/kernel/early.c @@ -210,7 +210,7 @@ static noinline __init void detect_machine_type(void) machine_flags |= MACHINE_FLAG_VM; } -static void early_pgm_check_handler(void) +static __init void early_pgm_check_handler(void) { unsigned long addr; const struct exception_table_entry *fixup; @@ -222,7 +222,7 @@ static void early_pgm_check_handler(void) S390_lowcore.program_old_psw.addr = fixup->fixup | PSW_ADDR_AMODE; } -void setup_lowcore_early(void) +static noinline __init void setup_lowcore_early(void) { psw_t psw; |
