Commit a9b011f5 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: (22 commits)
  [S390] Update default configuration.
  [S390] kprobes: defer setting of ctlblk state
  [S390] Enable tick based perf_counter on s390.
  [S390] dasd: fix refcounting in dasd_change_state
  [S390] lockless idle time accounting
  [S390] driver_data access
  [S390] pm: fix build error for !SMP
  [S390] dasd_pm: fix stop flag handling
  [S390] ap/zcrypt: Suspend/Resume ap bus and zcrypt
  [S390] qdio: Sanitize do_QDIO sanity checks
  [S390] qdio: leave inbound SBALs primed
  [S390] qdio: merge AI tasklet into interrupt handler
  [S390] qdio: extract all primed SBALs at once
  [S390] qdio: fix check for running under z/VM
  [S390] qdio: move adapter interrupt tasklet code
  [S390] Use del_timer instead of del_timer_sync
  [S390] s390: remove DEBUG_MALLOC
  [S390] vt220 console: convert from bootmem to slab
  [S390] sclp console: convert from bootmem to slab
  [S390] 3270 console: convert from bootmem to slab
  ...
parents b5bdd438 da6330fc

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ config S390 
	select HAVE_KVM if 64BIT

	select HAVE_ARCH_TRACEHOOK

	select INIT_ALL_POSSIBLE

	select HAVE_PERF_COUNTERS



source "init/Kconfig"

arch/s390/defconfig

+54 −18
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.30-rc3

# Thu Apr 23 09:29:52 2009

# Linux kernel version: 2.6.30

# Mon Jun 22 11:08:16 2009

#

CONFIG_SCHED_MC=y

CONFIG_MMU=y
@@ -25,6 +25,7 @@ CONFIG_VIRT_CPU_ACCOUNTING=y 
CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y

CONFIG_S390=y

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

CONFIG_CONSTRUCTORS=y



#

# General setup
@@ -90,7 +91,6 @@ CONFIG_SYSCTL_SYSCALL=y 
CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set

# CONFIG_STRIP_ASM_SYMS is not set

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y

CONFIG_BUG=y
@@ -103,7 +103,14 @@ CONFIG_TIMERFD=y 
CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_AIO=y

CONFIG_HAVE_PERF_COUNTERS=y



#

# Performance Counters

#

# CONFIG_PERF_COUNTERS is not set

CONFIG_VM_EVENT_COUNTERS=y

# CONFIG_STRIP_ASM_SYMS is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y

# CONFIG_SLUB is not set
@@ -119,6 +126,11 @@ CONFIG_HAVE_KRETPROBES=y 
CONFIG_HAVE_ARCH_TRACEHOOK=y

CONFIG_USE_GENERIC_SMP_HELPERS=y

CONFIG_HAVE_DEFAULT_NO_SPIN_MUTEXES=y



#

# GCOV-based kernel profiling

#

# CONFIG_GCOV_KERNEL is not set

# CONFIG_SLOW_WORK is not set

# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set

CONFIG_SLABINFO=y
@@ -150,7 +162,7 @@ CONFIG_DEFAULT_DEADLINE=y 
# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="deadline"

CONFIG_PREEMPT_NOTIFIERS=y

# CONFIG_FREEZER is not set

CONFIG_FREEZER=y



#

# Base setup
@@ -199,6 +211,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y 
CONFIG_ARCH_SELECT_MEMORY_MODEL=y

CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y

CONFIG_ARCH_HIBERNATION_POSSIBLE=y

CONFIG_SELECT_MEMORY_MODEL=y

# CONFIG_FLATMEM_MANUAL is not set

# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -218,9 +231,9 @@ CONFIG_PHYS_ADDR_T_64BIT=y 
CONFIG_ZONE_DMA_FLAG=1

CONFIG_BOUNCE=y

CONFIG_VIRT_TO_BUS=y

CONFIG_UNEVICTABLE_LRU=y

CONFIG_HAVE_MLOCK=y

CONFIG_HAVE_MLOCKED_PAGE_BIT=y

CONFIG_DEFAULT_MMAP_MIN_ADDR=4096



#

# I/O subsystem configuration
@@ -257,6 +270,16 @@ CONFIG_KEXEC=y 
# CONFIG_ZFCPDUMP is not set

CONFIG_S390_GUEST=y

CONFIG_SECCOMP=y



#

# Power Management

#

CONFIG_PM=y

# CONFIG_PM_DEBUG is not set

CONFIG_PM_SLEEP_SMP=y

CONFIG_PM_SLEEP=y

CONFIG_HIBERNATION=y

CONFIG_PM_STD_PARTITION=""

CONFIG_NET=y



#
@@ -384,6 +407,7 @@ CONFIG_SCTP_HMAC_MD5=y 
# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set

# CONFIG_PHONET is not set

# CONFIG_IEEE802154 is not set

CONFIG_NET_SCHED=y



#
@@ -446,6 +470,7 @@ CONFIG_CAN_BCM=m 
# CAN Device Drivers

#

CONFIG_CAN_VCAN=m

# CONFIG_CAN_DEV is not set

# CONFIG_CAN_DEBUG_DEVICES is not set

# CONFIG_AF_RXRPC is not set

# CONFIG_WIMAX is not set
@@ -524,10 +549,6 @@ CONFIG_BLK_DEV_SR=y 
CONFIG_BLK_DEV_SR_VENDOR=y

CONFIG_CHR_DEV_SG=y

# CONFIG_CHR_DEV_SCH is not set



#

# Some SCSI devices (e.g. CD jukebox) support multiple LUNs

#

CONFIG_SCSI_MULTI_LUN=y

CONFIG_SCSI_CONSTANTS=y

CONFIG_SCSI_LOGGING=y
@@ -578,7 +599,6 @@ CONFIG_DM_MULTIPATH=m 
# CONFIG_DM_DELAY is not set

# CONFIG_DM_UEVENT is not set

CONFIG_NETDEVICES=y

CONFIG_COMPAT_NET_DEV_OPS=y

# CONFIG_IFB is not set

CONFIG_DUMMY=m

CONFIG_BONDING=m
@@ -595,6 +615,7 @@ CONFIG_NET_ETHERNET=y 
# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set

# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set

# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set

# CONFIG_KS8842 is not set

CONFIG_NETDEV_1000=y

CONFIG_NETDEV_10000=y

# CONFIG_TR is not set
@@ -674,6 +695,11 @@ CONFIG_S390_TAPE_34XX=m 
# CONFIG_MONREADER is not set

CONFIG_MONWRITER=m

CONFIG_S390_VMUR=m



#

# PPS support

#

# CONFIG_PPS is not set

# CONFIG_POWER_SUPPLY is not set

# CONFIG_THERMAL is not set

# CONFIG_THERMAL_HWMON is not set
@@ -683,6 +709,10 @@ CONFIG_S390_VMUR=m 
# CONFIG_NEW_LEDS is not set

CONFIG_ACCESSIBILITY=y

# CONFIG_AUXDISPLAY is not set



#

# TI VLYNQ

#

# CONFIG_STAGING is not set



#
@@ -703,11 +733,12 @@ CONFIG_FS_MBCACHE=y 
# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set

CONFIG_FS_POSIX_ACL=y

CONFIG_FILE_LOCKING=y

# CONFIG_XFS_FS is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_BTRFS_FS is not set

CONFIG_FILE_LOCKING=y

CONFIG_FSNOTIFY=y

CONFIG_DNOTIFY=y

CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y
@@ -865,19 +896,23 @@ CONFIG_DEBUG_MEMORY_INIT=y 
CONFIG_SYSCTL_SYSCALL_CHECK=y

# CONFIG_DEBUG_PAGEALLOC is not set

CONFIG_HAVE_FUNCTION_TRACER=y

CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y

CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y

CONFIG_HAVE_DYNAMIC_FTRACE=y

CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y

CONFIG_HAVE_FTRACE_SYSCALLS=y

CONFIG_TRACING_SUPPORT=y



#

# Tracers

#

CONFIG_FTRACE=y

# CONFIG_FUNCTION_TRACER is not set

# CONFIG_IRQSOFF_TRACER is not set

# CONFIG_PREEMPT_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_CONTEXT_SWITCH_TRACER is not set

# CONFIG_EVENT_TRACER is not set

# CONFIG_ENABLE_DEFAULT_TRACERS is not set

# CONFIG_FTRACE_SYSCALLS is not set

# CONFIG_BOOT_TRACER is not set

# CONFIG_TRACE_BRANCH_PROFILING is not set

CONFIG_BRANCH_PROFILE_NONE=y

# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set

# CONFIG_PROFILE_ALL_BRANCHES is not set

# CONFIG_STACK_TRACER is not set

# CONFIG_KMEMTRACE is not set

# CONFIG_WORKQUEUE_TRACER is not set
@@ -886,6 +921,7 @@ CONFIG_TRACING_SUPPORT=y 
CONFIG_SAMPLES=y

# CONFIG_SAMPLE_KOBJECT is not set

# CONFIG_SAMPLE_KPROBES is not set

# CONFIG_KMEMCHECK is not set



#

# Security options

arch/s390/include/asm/cputime.h

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ cputime64_to_clock_t(cputime64_t cputime) 
}



struct s390_idle_data {

	spinlock_t lock;

	unsigned int sequence;

	unsigned long long idle_count;

	unsigned long long idle_enter;

	unsigned long long idle_time;

arch/s390/include/asm/debug.h

+0 −9
Original line number Diff line number Diff line
@@ -248,14 +248,5 @@ int debug_unregister_view(debug_info_t* id, struct debug_view* view); 
#define PRINT_FATAL(x...) printk ( KERN_DEBUG PRINTK_HEADER x )

#endif				/* DASD_DEBUG */



#undef DEBUG_MALLOC

#ifdef DEBUG_MALLOC

void *b;

#define kmalloc(x...) (PRINT_INFO(" kmalloc %p\n",b=kmalloc(x)),b)

#define kfree(x) PRINT_INFO(" kfree %p\n",x);kfree(x)

#define get_zeroed_page(x...) (PRINT_INFO(" gfp %p\n",b=get_zeroed_page(x)),b)

#define __get_free_pages(x...) (PRINT_INFO(" gfps %p\n",b=__get_free_pages(x)),b)

#endif				/* DEBUG_MALLOC */



#endif				/* __KERNEL__ */

#endif				/* DEBUG_H */

arch/s390/include/asm/perf_counter.h

0 → 100644
+8 −0
Original line number Diff line number Diff line 
/*

 * Performance counter support - s390 specific definitions.

 *

 * Copyright 2009 Martin Schwidefsky, IBM Corporation.

 */



static inline void set_perf_counter_pending(void) {}

static inline void clear_perf_counter_pending(void) {}

CRA Git | Maintained and supported by SUSTech CRA and CCSE