Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59f2fe32 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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)
parents 307cc790 1e3cab2f

arch/s390/include/asm/cpu_mf.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,8 @@ 
#ifndef _ASM_S390_CPU_MF_H

#ifndef _ASM_S390_CPU_MF_H

#define _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_IAE	(1 << 31)	/* invalid entry address */

#define CPU_MF_INT_SF_ISE	(1 << 30)	/* incorrect SDBT entry */

#define CPU_MF_INT_SF_ISE	(1 << 30)	/* incorrect SDBT entry */

#define CPU_MF_INT_SF_PRA	(1 << 29)	/* program request alert */

#define CPU_MF_INT_SF_PRA	(1 << 29)	/* program request alert */

arch/s390/include/asm/mmu.h

+2 −0
Original line number Original line Diff line number Diff line 
#ifndef __MMU_H

#ifndef __MMU_H

#define __MMU_H

#define __MMU_H





#include <linux/errno.h>



typedef struct {

typedef struct {

	atomic_t attach_count;

	atomic_t attach_count;

	unsigned int flush_mm;

	unsigned int flush_mm;

arch/s390/kernel/lgr.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/module.h>

#include <linux/module.h>

#include <linux/timer.h>

#include <linux/timer.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <asm/facility.h>

#include <asm/sysinfo.h>

#include <asm/sysinfo.h>

#include <asm/ebcdic.h>

#include <asm/ebcdic.h>

#include <asm/debug.h>

#include <asm/debug.h>

arch/s390/kernel/perf_cpum_cf.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/notifier.h>

#include <linux/notifier.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/export.h>

#include <linux/export.h>

#include <asm/system.h>

#include <asm/ctl_reg.h>

#include <asm/irq.h>

#include <asm/irq.h>

#include <asm/cpu_mf.h>

#include <asm/cpu_mf.h>

arch/s390/kernel/perf_event.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/perf_event.h>

#include <linux/perf_event.h>

#include <linux/percpu.h>

#include <linux/percpu.h>

#include <linux/export.h>

#include <linux/export.h>

#include <asm/system.h>

#include <asm/irq.h>

#include <asm/irq.h>

#include <asm/cpu_mf.h>

#include <asm/cpu_mf.h>

#include <asm/lowcore.h>

#include <asm/lowcore.h>