diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 19:52:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 19:52:50 -0800 |
| commit | fe1b4ba400193176213f95be3ea711a53518a609 (patch) | |
| tree | e60943d4703fca5a291fffc2e0b77a786b6db3f4 /include | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
| parent | [S390] cio: Call cancel_halt_clear even when actl == 0. (diff) | |
| download | linux-dev-fe1b4ba400193176213f95be3ea711a53518a609.tar.xz linux-dev-fe1b4ba400193176213f95be3ea711a53518a609.zip | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] cio: Call cancel_halt_clear even when actl == 0.
[S390] cio: Use path verification to check for path state.
[S390] cio: Fix locking when calling notify function.
[S390] Fixed handling of access register mode faults.
[S390] dasd: Use default recovery for SNSS requests
[S390] check_bugs() should be inline.
[S390] tape: Compression overwrites crypto setting
[S390] nss: disable kexec.
[S390] reipl: move dump_prefix_page out of text section.
[S390] smp: disable preemption in smp_call_function/smp_call_function_on
[S390] kprobes breaks BUG_ON
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-s390/bugs.h | 2 | ||||
| -rw-r--r-- | include/asm-s390/ipl.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-s390/bugs.h b/include/asm-s390/bugs.h index 2c3659621314..011f1e6a2a6c 100644 --- a/include/asm-s390/bugs.h +++ b/include/asm-s390/bugs.h @@ -16,7 +16,7 @@ * void check_bugs(void); */ -static void __init check_bugs(void) +static inline void check_bugs(void) { /* s390 has no bugs ... */ } diff --git a/include/asm-s390/ipl.h b/include/asm-s390/ipl.h index 5650d3d4ae46..660f78271a93 100644 --- a/include/asm-s390/ipl.h +++ b/include/asm-s390/ipl.h @@ -74,6 +74,7 @@ struct ipl_parameter_block { extern u32 ipl_flags; extern u16 ipl_devno; +extern u32 dump_prefix_page; extern void do_reipl(void); extern void ipl_save_parameters(void); |