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

Commit fb5131e1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: (65 commits)
  [S390] prevent unneccesary loops_per_jiffy recalculation
  [S390] cpuinfo: use get_online_cpus() instead of preempt_disable()
  [S390] smp: remove cpu hotplug messages
  [S390] mutex: enable spinning mutex on s390
  [S390] mutex: Introduce arch_mutex_cpu_relax()
  [S390] cio: fix ccwgroup unregistration race condition
  [S390] perf: add DWARF register lookup for s390
  [S390] cleanup ftrace backend functions
  [S390] ptrace cleanup
  [S390] smp/idle: call init_idle() before starting a new cpu
  [S390] smp: delay idle task creation
  [S390] dasd: Correct retry counter for terminated I/O.
  [S390] dasd: Add support for raw ECKD access.
  [S390] dasd: Prevent deadlock during suspend/resume.
  [S390] dasd: Improve handling of stolen DASD reservation
  [S390] dasd: do path verification for paths added at runtime
  [S390] dasd: add High Performance FICON multitrack support
  [S390] cio: reduce memory consumption of itcw structures
  [S390] nmi: enable machine checks early
  [S390] qeth: buffer count imbalance
  ...
parents d074b104 8e102301

arch/s390/Kconfig

+67 −63
Original line number Diff line number Diff line 
config SCHED_MC

	def_bool y

	depends on SMP



config MMU

	def_bool y



config ZONE_DMA

	def_bool y

	depends on 64BIT

	def_bool y if 64BIT



config LOCKDEP_SUPPORT

	def_bool y
@@ -25,12 +20,10 @@ config RWSEM_XCHGADD_ALGORITHM 
	def_bool y



config ARCH_HAS_ILOG2_U32

	bool

	default n

	def_bool n



config ARCH_HAS_ILOG2_U64

	bool

	default n

	def_bool n



config GENERIC_HWEIGHT

	def_bool y
@@ -42,9 +35,7 @@ config GENERIC_CLOCKEVENTS 
	def_bool y



config GENERIC_BUG

	bool

	depends on BUG

	default y

	def_bool y if BUG



config GENERIC_BUG_RELATIVE_POINTERS

	def_bool y
@@ -59,13 +50,10 @@ config ARCH_DMA_ADDR_T_64BIT 
	def_bool 64BIT



config GENERIC_LOCKBREAK

	bool

	default y

	depends on SMP && PREEMPT

	def_bool y if SMP && PREEMPT



config PGSTE

	bool

	default y if KVM

	def_bool y if KVM



config VIRT_CPU_ACCOUNTING

	def_bool y
@@ -85,7 +73,6 @@ config S390 
	select HAVE_DYNAMIC_FTRACE

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_DEFAULT_NO_SPIN_MUTEXES

	select HAVE_OPROFILE

	select HAVE_KPROBES

	select HAVE_KRETPROBES
@@ -130,8 +117,7 @@ config S390 
	select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE



config SCHED_OMIT_FRAME_POINTER

	bool

	default y

	def_bool y



source "init/Kconfig"
@@ -144,20 +130,21 @@ comment "Processor type and features" 
source "kernel/time/Kconfig"



config 64BIT

	bool "64 bit kernel"

	def_bool y

	prompt "64 bit kernel"

	help

	  Select this option if you have an IBM z/Architecture machine

	  and want to use the 64 bit addressing mode.



config 32BIT

	bool

	default y if !64BIT

	def_bool y if !64BIT



config KTIME_SCALAR

	def_bool 32BIT



config SMP

	bool "Symmetric multi-processing support"

	def_bool y

	prompt "Symmetric multi-processing support"

	---help---

	  This enables support for systems with more than one CPU. If you have

	  a system with only one CPU, like most personal computers, say N. If
@@ -189,10 +176,10 @@ config NR_CPUS 
	  approximately sixteen kilobytes to the kernel image.



config HOTPLUG_CPU

	bool "Support for hot-pluggable CPUs"

	def_bool y

	prompt "Support for hot-pluggable CPUs"

	depends on SMP

	select HOTPLUG

	default n

	help

	  Say Y here to be able to turn CPUs off and on. CPUs

	  can be controlled through /sys/devices/system/cpu/cpu#.
@@ -208,14 +195,16 @@ config SCHED_MC 
	  increased overhead in some places.



config SCHED_BOOK

	bool "Book scheduler support"

	def_bool y

	prompt "Book scheduler support"

	depends on SMP && SCHED_MC

	help

	  Book scheduler support improves the CPU scheduler's decision making

	  when dealing with machines that have several books.



config MATHEMU

	bool "IEEE FPU emulation"

	def_bool y

	prompt "IEEE FPU emulation"

	depends on MARCH_G5

	help

	  This option is required for IEEE compliant floating point arithmetic
@@ -223,7 +212,8 @@ config MATHEMU 
	  need this.



config COMPAT

	bool "Kernel support for 31 bit emulation"

	def_bool y

	prompt "Kernel support for 31 bit emulation"

	depends on 64BIT

	select COMPAT_BINFMT_ELF

	help
@@ -233,16 +223,14 @@ config COMPAT 
	  executing 31 bit applications.  It is safe to say "Y".



config SYSVIPC_COMPAT

	bool

	depends on COMPAT && SYSVIPC

	default y

	def_bool y if COMPAT && SYSVIPC



config AUDIT_ARCH

	bool

	default y

	def_bool y



config S390_EXEC_PROTECT

	bool "Data execute protection"

	def_bool y

	prompt "Data execute protection"

	help

	  This option allows to enable a buffer overflow protection for user

	  space programs and it also selects the addressing mode option above.
@@ -302,7 +290,8 @@ config MARCH_Z196 
endchoice



config PACK_STACK

	bool "Pack kernel stack"

	def_bool y

	prompt "Pack kernel stack"

	help

	  This option enables the compiler option -mkernel-backchain if it

	  is available. If the option is available the compiler supports
@@ -315,7 +304,8 @@ config PACK_STACK 
	  Say Y if you are unsure.



config SMALL_STACK

	bool "Use 8kb for kernel stack instead of 16kb"

	def_bool n

	prompt "Use 8kb for kernel stack instead of 16kb"

	depends on PACK_STACK && 64BIT && !LOCKDEP

	help

	  If you say Y here and the compiler supports the -mkernel-backchain
@@ -327,7 +317,8 @@ config SMALL_STACK 
	  Say N if you are unsure.



config CHECK_STACK

	bool "Detect kernel stack overflow"

	def_bool y

	prompt "Detect kernel stack overflow"

	help

	  This option enables the compiler option -mstack-guard and

	  -mstack-size if they are available. If the compiler supports them
@@ -351,7 +342,8 @@ config STACK_GUARD 
	  512 for 64 bit.



config WARN_STACK

	bool "Emit compiler warnings for function with broken stack usage"

	def_bool n

	prompt "Emit compiler warnings for function with broken stack usage"

	help

	  This option enables the compiler options -mwarn-framesize and

	  -mwarn-dynamicstack. If the compiler supports these options it
@@ -389,8 +381,7 @@ config ARCH_SELECT_MEMORY_MODEL 
	def_bool y



config ARCH_ENABLE_MEMORY_HOTPLUG

	def_bool y

	depends on SPARSEMEM

	def_bool y if SPARSEMEM



config ARCH_ENABLE_MEMORY_HOTREMOVE

	def_bool y
@@ -403,7 +394,8 @@ source "mm/Kconfig" 
comment "I/O subsystem configuration"



config QDIO

	tristate "QDIO support"

	def_tristate y

	prompt "QDIO support"

	---help---

	  This driver provides the Queued Direct I/O base support for

	  IBM System z.
@@ -414,7 +406,8 @@ config QDIO 
	  If unsure, say Y.



config CHSC_SCH

	tristate "Support for CHSC subchannels"

	def_tristate y

	prompt "Support for CHSC subchannels"

	help

	  This driver allows usage of CHSC subchannels. A CHSC subchannel

	  is usually present on LPAR only.
@@ -432,7 +425,8 @@ config CHSC_SCH 
comment "Misc"



config IPL

	bool "Builtin IPL record support"

	def_bool y

	prompt "Builtin IPL record support"

	help

	  If you want to use the produced kernel to IPL directly from a

	  device, you have to merge a bootsector specific to the device
@@ -464,7 +458,8 @@ config FORCE_MAX_ZONEORDER 
	default "9"



config PFAULT

	bool "Pseudo page fault support"

	def_bool y

	prompt "Pseudo page fault support"

	help

	  Select this option, if you want to use PFAULT pseudo page fault

	  handling under VM. If running native or in LPAR, this option
@@ -476,7 +471,8 @@ config PFAULT 
	  this option.



config SHARED_KERNEL

	bool "VM shared kernel support"

	def_bool y

	prompt "VM shared kernel support"

	help

	  Select this option, if you want to share the text segment of the

	  Linux kernel between different VM guests. This reduces memory
@@ -487,7 +483,8 @@ config SHARED_KERNEL 
	  doing and want to exploit this feature.



config CMM

	tristate "Cooperative memory management"

	def_tristate n

	prompt "Cooperative memory management"

	help

	  Select this option, if you want to enable the kernel interface

	  to reduce the memory size of the system. This is accomplished
@@ -499,14 +496,16 @@ config CMM 
	  option.



config CMM_IUCV

	bool "IUCV special message interface to cooperative memory management"

	def_bool y

	prompt "IUCV special message interface to cooperative memory management"

	depends on CMM && (SMSGIUCV=y || CMM=SMSGIUCV)

	help

	  Select this option to enable the special message interface to

	  the cooperative memory management.



config APPLDATA_BASE

	bool "Linux - VM Monitor Stream, base infrastructure"

	def_bool n

	prompt "Linux - VM Monitor Stream, base infrastructure"

	depends on PROC_FS

	help

	  This provides a kernel interface for creating and updating z/VM APPLDATA
@@ -521,7 +520,8 @@ config APPLDATA_BASE 
	  The /proc entries can also be read from, showing the current settings.



config APPLDATA_MEM

	tristate "Monitor memory management statistics"

	def_tristate m

	prompt "Monitor memory management statistics"

	depends on APPLDATA_BASE && VM_EVENT_COUNTERS

	help

	  This provides memory management related data to the Linux - VM Monitor
@@ -537,7 +537,8 @@ config APPLDATA_MEM 
	  appldata_mem.o.



config APPLDATA_OS

	tristate "Monitor OS statistics"

	def_tristate m

	prompt "Monitor OS statistics"

	depends on APPLDATA_BASE

	help

	  This provides OS related data to the Linux - VM Monitor Stream, like
@@ -551,7 +552,8 @@ config APPLDATA_OS 
	  appldata_os.o.



config APPLDATA_NET_SUM

	tristate "Monitor overall network statistics"

	def_tristate m

	prompt "Monitor overall network statistics"

	depends on APPLDATA_BASE && NET

	help

	  This provides network related data to the Linux - VM Monitor Stream,
@@ -568,30 +570,32 @@ config APPLDATA_NET_SUM 
source kernel/Kconfig.hz



config S390_HYPFS_FS

	bool "s390 hypervisor file system support"

	def_bool y

	prompt "s390 hypervisor file system support"

	select SYS_HYPERVISOR

	default y

	help

	  This is a virtual file system intended to provide accounting

	  information in an s390 hypervisor environment.



config KEXEC

	bool "kexec system call"

	def_bool n

	prompt "kexec system call"

	help

	  kexec is a system call that implements the ability to shutdown your

	  current kernel, and to start another kernel.  It is like a reboot

	  but is independent of hardware/microcode support.



config ZFCPDUMP

	bool "zfcpdump support"

	def_bool n

	prompt "zfcpdump support"

	select SMP

	default n

	help

	  Select this option if you want to build an zfcpdump enabled kernel.

	  Refer to <file:Documentation/s390/zfcpdump.txt> for more details on this.



config S390_GUEST

bool "s390 guest support for KVM (EXPERIMENTAL)"

	def_bool y

	prompt "s390 guest support for KVM (EXPERIMENTAL)"

	depends on 64BIT && EXPERIMENTAL

	select VIRTIO

	select VIRTIO_RING
@@ -603,9 +607,9 @@ bool "s390 guest support for KVM (EXPERIMENTAL)" 
	  the default console.



config SECCOMP

	bool "Enable seccomp to safely compute untrusted bytecode"

	def_bool y

	prompt "Enable seccomp to safely compute untrusted bytecode"

	depends on PROC_FS

	default y

	help

	  This kernel feature is useful for number crunching applications

	  that may need to compute untrusted bytecode during their

arch/s390/Kconfig.debug

+3 −3
Original line number Diff line number Diff line 
menu "Kernel hacking"



config TRACE_IRQFLAGS_SUPPORT

	bool

	default y

	def_bool y



source "lib/Kconfig.debug"
@@ -19,7 +18,8 @@ config STRICT_DEVMEM 
	  If you are unsure, say Y.



config DEBUG_STRICT_USER_COPY_CHECKS

	bool "Strict user copy size checks"

	def_bool n

	prompt "Strict user copy size checks"

	---help---

	  Enabling this option turns a certain set of sanity checks for user

	  copy operations into compile time warnings.

arch/s390/defconfig

+56 −96
Original line number Diff line number Diff line
@@ -2,16 +2,12 @@ CONFIG_EXPERIMENTAL=y 
CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_AUDIT=y

CONFIG_RCU_TRACE=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_CGROUPS=y

CONFIG_CGROUP_NS=y

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_UTS_NS=y

CONFIG_IPC_NS=y

CONFIG_BLK_DEV_INITRD=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_PERF_EVENTS=y

CONFIG_SLAB=y

CONFIG_KPROBES=y

CONFIG_MODULES=y
@@ -20,24 +16,12 @@ CONFIG_MODVERSIONS=y 
CONFIG_DEFAULT_DEADLINE=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_64BIT=y

CONFIG_SMP=y

CONFIG_NR_CPUS=32

CONFIG_COMPAT=y

CONFIG_S390_EXEC_PROTECT=y

CONFIG_PACK_STACK=y

CONFIG_CHECK_STACK=y

CONFIG_PREEMPT=y

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTREMOVE=y

CONFIG_QDIO=y

CONFIG_CHSC_SCH=m

CONFIG_IPL=y

CONFIG_BINFMT_MISC=m

CONFIG_PFAULT=y

CONFIG_HZ_100=y

CONFIG_KEXEC=y

CONFIG_S390_GUEST=y

CONFIG_PM=y

CONFIG_HIBERNATION=y

CONFIG_PACKET=y
@@ -46,16 +30,15 @@ CONFIG_NET_KEY=y 
CONFIG_AFIUCV=m

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

# CONFIG_INET_LRO is not set

CONFIG_IPV6=y

CONFIG_NETFILTER=y

CONFIG_NETFILTER_NETLINK_QUEUE=m

CONFIG_NETFILTER_NETLINK_LOG=m

CONFIG_NF_CONNTRACK=m

# CONFIG_NF_CT_PROTO_SCTP is not set

CONFIG_NET_SCTPPROBE=m

CONFIG_L2TP=m

CONFIG_L2TP_DEBUGFS=m

CONFIG_VLAN_8021Q=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_CBQ=m

CONFIG_NET_SCH_PRIO=m

CONFIG_NET_SCH_MULTIQ=y

CONFIG_NET_SCH_RED=m

CONFIG_NET_SCH_SFQ=m

CONFIG_NET_SCH_TEQL=m
@@ -69,28 +52,14 @@ CONFIG_NET_CLS_U32=m 
CONFIG_CLS_U32_MARK=y

CONFIG_NET_CLS_RSVP=m

CONFIG_NET_CLS_RSVP6=m

CONFIG_NET_CLS_FLOW=m

CONFIG_NET_CLS_ACT=y

CONFIG_NET_ACT_POLICE=y

CONFIG_NET_ACT_NAT=m

CONFIG_CAN=m

CONFIG_CAN_RAW=m

CONFIG_CAN_BCM=m

CONFIG_CAN_VCAN=m

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_XIP=y

CONFIG_BLK_DEV_XPRAM=m

CONFIG_DASD=y

CONFIG_DASD_PROFILE=y

CONFIG_DASD_ECKD=y

CONFIG_DASD_FBA=y

CONFIG_DASD_DIAG=y

CONFIG_DASD_EER=y

CONFIG_VIRTIO_BLK=m

CONFIG_VIRTIO_BLK=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=y
@@ -102,101 +71,92 @@ CONFIG_SCSI_CONSTANTS=y 
CONFIG_SCSI_LOGGING=y

CONFIG_SCSI_SCAN_ASYNC=y

CONFIG_ZFCP=y

CONFIG_SCSI_DH=m

CONFIG_SCSI_DH_RDAC=m

CONFIG_SCSI_DH_HP_SW=m

CONFIG_SCSI_DH_EMC=m

CONFIG_SCSI_DH_ALUA=m

CONFIG_SCSI_OSD_INITIATOR=m

CONFIG_SCSI_OSD_ULD=m

CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

CONFIG_MD_LINEAR=m

CONFIG_MD_RAID0=m

CONFIG_MD_RAID1=m

CONFIG_MD_MULTIPATH=m

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y

CONFIG_DM_SNAPSHOT=y

CONFIG_DM_MIRROR=y

CONFIG_DM_ZERO=y

CONFIG_DM_MULTIPATH=m

CONFIG_ZFCP_DIF=y

CONFIG_NETDEVICES=y

CONFIG_DUMMY=m

CONFIG_BONDING=m

CONFIG_EQUALIZER=m

CONFIG_TUN=m

CONFIG_VETH=m

CONFIG_NET_ETHERNET=y

CONFIG_LCS=m

CONFIG_CTCM=m

CONFIG_QETH=y

CONFIG_QETH_L2=y

CONFIG_QETH_L3=y

CONFIG_VIRTIO_NET=m

CONFIG_HW_RANDOM_VIRTIO=m

CONFIG_VIRTIO_NET=y

CONFIG_RAW_DRIVER=m

CONFIG_TN3270=y

CONFIG_TN3270_TTY=y

CONFIG_TN3270_FS=m

CONFIG_TN3270_CONSOLE=y

CONFIG_TN3215=y

CONFIG_TN3215_CONSOLE=y

CONFIG_SCLP_TTY=y

CONFIG_SCLP_CONSOLE=y

CONFIG_SCLP_VT220_TTY=y

CONFIG_SCLP_VT220_CONSOLE=y

CONFIG_SCLP_CPI=m

CONFIG_SCLP_ASYNC=m

CONFIG_S390_TAPE=m

CONFIG_S390_TAPE_BLOCK=y

CONFIG_S390_TAPE_34XX=m

CONFIG_ACCESSIBILITY=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_PROC_KCORE=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFSD=y

CONFIG_NFSD_V3=y

# CONFIG_NETWORK_FILESYSTEMS is not set

CONFIG_PARTITION_ADVANCED=y

CONFIG_IBM_PARTITION=y

CONFIG_DLM=m

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

# CONFIG_SCHED_DEBUG is not set

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_TIMER_STATS=y

CONFIG_PROVE_LOCKING=y

CONFIG_PROVE_RCU=y

CONFIG_LOCK_STAT=y

CONFIG_DEBUG_LOCKDEP=y

CONFIG_DEBUG_SPINLOCK_SLEEP=y

CONFIG_DEBUG_LIST=y

CONFIG_DEBUG_NOTIFIERS=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y

CONFIG_KPROBES_SANITY_TEST=y

CONFIG_CPU_NOTIFIER_ERROR_INJECT=m

CONFIG_LATENCYTOP=y

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_SAMPLES=y

CONFIG_CRYPTO_FIPS=y

CONFIG_DEBUG_PAGEALLOC=y

# CONFIG_FTRACE is not set

# CONFIG_STRICT_DEVMEM is not set

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_AUTHENC=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_GCM=m

CONFIG_CRYPTO_CBC=y

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_ECB=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_RMD256=m

CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA256=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SALSA20=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_DEFLATE=m

CONFIG_CRYPTO_ZLIB=m

CONFIG_CRYPTO_LZO=m

CONFIG_ZCRYPT=m

CONFIG_CRYPTO_SHA1_S390=m

CONFIG_CRYPTO_SHA256_S390=m

CONFIG_CRYPTO_SHA512_S390=m

CONFIG_CRC_T10DIF=y

CONFIG_CRC32=m

CONFIG_CRYPTO_DES_S390=m

CONFIG_CRYPTO_AES_S390=m

CONFIG_CRC7=m

CONFIG_KVM=m

CONFIG_VIRTIO_BALLOON=m
 
CONFIG_VIRTIO_BALLOON=y

arch/s390/hypfs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,4 +4,4 @@ 


obj-$(CONFIG_S390_HYPFS_FS) += s390_hypfs.o



s390_hypfs-objs := inode.o hypfs_diag.o hypfs_vm.o
 
s390_hypfs-objs := inode.o hypfs_diag.o hypfs_vm.o hypfs_dbfs.o

arch/s390/hypfs/hypfs.h

+31 −2
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
#include <linux/fs.h>

#include <linux/types.h>

#include <linux/debugfs.h>

#include <linux/workqueue.h>

#include <linux/kref.h>



#define REG_FILE_MODE    0440

#define UPDATE_FILE_MODE 0220
@@ -38,6 +40,33 @@ extern int hypfs_vm_init(void); 
extern void hypfs_vm_exit(void);

extern int hypfs_vm_create_files(struct super_block *sb, struct dentry *root);



/* Directory for debugfs files */

extern struct dentry *hypfs_dbfs_dir;

/* debugfs interface */

struct hypfs_dbfs_file;



struct hypfs_dbfs_data {

	void			*buf;

	void			*buf_free_ptr;

	size_t			size;

	struct hypfs_dbfs_file	*dbfs_file;;

	struct kref		kref;

};



struct hypfs_dbfs_file {

	const char	*name;

	int		(*data_create)(void **data, void **data_free_ptr,

				       size_t *size);

	void		(*data_free)(const void *buf_free_ptr);



	/* Private data for hypfs_dbfs.c */

	struct hypfs_dbfs_data	*data;

	struct delayed_work	data_free_work;

	struct mutex		lock;

	struct dentry		*dentry;

};



extern int hypfs_dbfs_init(void);

extern void hypfs_dbfs_exit(void);

extern int hypfs_dbfs_create_file(struct hypfs_dbfs_file *df);

extern void hypfs_dbfs_remove_file(struct hypfs_dbfs_file *df);



#endif /* _HYPFS_H_ */