diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 10:57:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 10:57:40 -0700 |
| commit | 59f2fe326666002f8387fb434a871815d3535f40 (patch) | |
| tree | 4808568861b1a1ec501c89476a105f14acb24818 /arch/s390/kernel/smp.c | |
| parent | 307cc7904841fd66a848ece16a179b49ae1a4ba4 (diff) | |
| parent | 1e3cab2f2fbca25289094698fd1280ecfad7a8d4 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 build fixes from Martin Schwidefsky.
More small fixes for the system.h disintegration.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
[S390] Fix build errors (fallout from system.h disintegration)
Diffstat (limited to 'arch/s390/kernel/smp.c')
| -rw-r--r-- | arch/s390/kernel/smp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index a8bf9994b086..1f77227669e8 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c @@ -32,6 +32,8 @@ #include <linux/slab.h> #include <linux/crash_dump.h> #include <asm/asm-offsets.h> +#include <asm/switch_to.h> +#include <asm/facility.h> #include <asm/ipl.h> #include <asm/setup.h> #include <asm/irq.h> |