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 | |
| 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')
| -rw-r--r-- | arch/s390/include/asm/cpu_mf.h | 2 | ||||
| -rw-r--r-- | arch/s390/include/asm/mmu.h | 2 | ||||
| -rw-r--r-- | arch/s390/kernel/lgr.c | 1 | ||||
| -rw-r--r-- | arch/s390/kernel/perf_cpum_cf.c | 2 | ||||
| -rw-r--r-- | arch/s390/kernel/perf_event.c | 1 | ||||
| -rw-r--r-- | arch/s390/kernel/setup.c | 1 | ||||
| -rw-r--r-- | arch/s390/kernel/smp.c | 2 |
7 files changed, 9 insertions, 2 deletions
diff --git a/arch/s390/include/asm/cpu_mf.h b/arch/s390/include/asm/cpu_mf.h index e49db5d5d06f..a3afecdae145 100644 --- a/arch/s390/include/asm/cpu_mf.h +++ b/arch/s390/include/asm/cpu_mf.h @@ -12,6 +12,8 @@ #ifndef _ASM_S390_CPU_MF_H #define _ASM_S390_CPU_MF_H +#include <asm/facility.h> + #define CPU_MF_INT_SF_IAE (1 << 31) /* invalid entry address */ #define CPU_MF_INT_SF_ISE (1 << 30) /* incorrect SDBT entry */ #define CPU_MF_INT_SF_PRA (1 << 29) /* program request alert */ diff --git a/arch/s390/include/asm/mmu.h b/arch/s390/include/asm/mmu.h index 1c7d6ce328bf..6340178748bf 100644 --- a/arch/s390/include/asm/mmu.h +++ b/arch/s390/include/asm/mmu.h @@ -1,6 +1,8 @@ #ifndef __MMU_H #define __MMU_H +#include <linux/errno.h> + typedef struct { atomic_t attach_count; unsigned int flush_mm; diff --git a/arch/s390/kernel/lgr.c b/arch/s390/kernel/lgr.c index ac39e7a731fc..87f080b17af1 100644 --- a/arch/s390/kernel/lgr.c +++ b/arch/s390/kernel/lgr.c @@ -8,6 +8,7 @@ #include <linux/module.h> #include <linux/timer.h> #include <linux/slab.h> +#include <asm/facility.h> #include <asm/sysinfo.h> #include <asm/ebcdic.h> #include <asm/debug.h> diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c index 8481ecf2ad71..46405086479c 100644 --- a/arch/s390/kernel/perf_cpum_cf.c +++ b/arch/s390/kernel/perf_cpum_cf.c @@ -18,7 +18,7 @@ #include <linux/notifier.h> #include <linux/init.h> #include <linux/export.h> -#include <asm/system.h> +#include <asm/ctl_reg.h> #include <asm/irq.h> #include <asm/cpu_mf.h> diff --git a/arch/s390/kernel/perf_event.c b/arch/s390/kernel/perf_event.c index 609f985198cf..f58f37f66824 100644 --- a/arch/s390/kernel/perf_event.c +++ b/arch/s390/kernel/perf_event.c @@ -15,7 +15,6 @@ #include <linux/perf_event.h> #include <linux/percpu.h> #include <linux/export.h> -#include <asm/system.h> #include <asm/irq.h> #include <asm/cpu_mf.h> #include <asm/lowcore.h> diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 1581ea2e027a..06264ae8ccd9 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -50,6 +50,7 @@ #include <asm/ipl.h> #include <asm/uaccess.h> +#include <asm/facility.h> #include <asm/smp.h> #include <asm/mmu_context.h> #include <asm/cpcmd.h> 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> |