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

Commit 81ec44a6 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 update from Martin Schwidefsky:
 "The most prominent change in this patch set is the software dirty bit
  patch for s390.  It removes __HAVE_ARCH_PAGE_TEST_AND_CLEAR_DIRTY and
  the page_test_and_clear_dirty primitive which makes the common memory
  management code a bit less obscure.

  Heiko fixed most of the PCI related fallout, more often than not
  missing GENERIC_HARDIRQS dependencies.  Notable is one of the 3270
  patches which adds an export to tty_io to be able to resize a tty.

  The rest is the usual bunch of cleanups and bug fixes."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (42 commits)
  s390/module: Add missing R_390_NONE relocation type
  drivers/gpio: add missing GENERIC_HARDIRQ dependency
  drivers/input: add couple of missing GENERIC_HARDIRQS dependencies
  s390/cleanup: rename SPP to LPP
  s390/mm: implement software dirty bits
  s390/mm: Fix crst upgrade of mmap with MAP_FIXED
  s390/linker skript: discard exit.data at runtime
  drivers/media: add missing GENERIC_HARDIRQS dependency
  s390/bpf,jit: add vlan tag support
  drivers/net,AT91RM9200: add missing GENERIC_HARDIRQS dependency
  iucv: fix kernel panic at reboot
  s390/Kconfig: sort list of arch selected config options
  phylib: remove !S390 dependeny from Kconfig
  uio: remove !S390 dependency from Kconfig
  dasd: fix sysfs cleanup in dasd_generic_remove
  s390/pci: fix hotplug module init
  s390/pci: cleanup clp page allocation
  s390/pci: cleanup clp inline assembly
  s390/perf: cpum_cf: fallback to software sampling events
  s390/mm: provide PAGE_SHARED define
  ...
parents 48a732df e80cfc31

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6519,7 +6519,7 @@ S: Supported 
F:	drivers/s390/net/



S390 ZCRYPT DRIVER

M:	Holger Dengler <hd@linux.vnet.ibm.com>

M:	Ingo Tuchscherer <ingo.tuchscherer@de.ibm.com>

M:	linux390@de.ibm.com

L:	linux-s390@vger.kernel.org

W:	http://www.ibm.com/developerworks/linux/linux390/

arch/s390/Kconfig

+57 −56
Original line number Diff line number Diff line
@@ -60,85 +60,86 @@ config PCI_QUIRKS 


config S390

	def_bool y

	select USE_GENERIC_SMP_HELPERS if SMP

	select GENERIC_CPU_DEVICES if !SMP

	select HAVE_SYSCALL_WRAPPERS

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_C_RECORDMCOUNT

	select HAVE_SYSCALL_TRACEPOINTS

	select SYSCTL_EXCEPTION_TRACE

	select HAVE_DYNAMIC_FTRACE

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_OPROFILE

	select HAVE_KPROBES

	select HAVE_KRETPROBES

	select HAVE_KVM if 64BIT

	select HAVE_ARCH_TRACEHOOK

	select INIT_ALL_POSSIBLE

	select HAVE_PERF_EVENTS

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_LZO

	select HAVE_KERNEL_XZ

	select HAVE_ARCH_MUTEX_CPU_RELAX

	select HAVE_ARCH_JUMP_LABEL if !MARCH_G5

	select HAVE_BPF_JIT if 64BIT && PACK_STACK

	select ARCH_SAVE_PAGE_KEYS if HIBERNATION

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK_NODE_MAP

	select HAVE_CMPXCHG_LOCAL

	select HAVE_CMPXCHG_DOUBLE

	select HAVE_ALIGNED_STRUCT_PAGE if SLUB

	select HAVE_VIRT_CPU_ACCOUNTING

	select VIRT_CPU_ACCOUNTING

	select ARCH_DISCARD_MEMBLOCK

	select BUILDTIME_EXTABLE_SORT

	select ARCH_INLINE_SPIN_TRYLOCK

	select ARCH_INLINE_SPIN_TRYLOCK_BH

	select ARCH_INLINE_SPIN_LOCK

	select ARCH_INLINE_SPIN_LOCK_BH

	select ARCH_INLINE_SPIN_LOCK_IRQ

	select ARCH_INLINE_SPIN_LOCK_IRQSAVE

	select ARCH_INLINE_SPIN_UNLOCK

	select ARCH_INLINE_SPIN_UNLOCK_BH

	select ARCH_INLINE_SPIN_UNLOCK_IRQ

	select ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE

	select ARCH_INLINE_READ_TRYLOCK

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select ARCH_INLINE_READ_LOCK

	select ARCH_INLINE_READ_LOCK_BH

	select ARCH_INLINE_READ_LOCK_IRQ

	select ARCH_INLINE_READ_LOCK_IRQSAVE

	select ARCH_INLINE_READ_TRYLOCK

	select ARCH_INLINE_READ_UNLOCK

	select ARCH_INLINE_READ_UNLOCK_BH

	select ARCH_INLINE_READ_UNLOCK_IRQ

	select ARCH_INLINE_READ_UNLOCK_IRQRESTORE

	select ARCH_INLINE_WRITE_TRYLOCK

	select ARCH_INLINE_SPIN_LOCK

	select ARCH_INLINE_SPIN_LOCK_BH

	select ARCH_INLINE_SPIN_LOCK_IRQ

	select ARCH_INLINE_SPIN_LOCK_IRQSAVE

	select ARCH_INLINE_SPIN_TRYLOCK

	select ARCH_INLINE_SPIN_TRYLOCK_BH

	select ARCH_INLINE_SPIN_UNLOCK

	select ARCH_INLINE_SPIN_UNLOCK_BH

	select ARCH_INLINE_SPIN_UNLOCK_IRQ

	select ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE

	select ARCH_INLINE_WRITE_LOCK

	select ARCH_INLINE_WRITE_LOCK_BH

	select ARCH_INLINE_WRITE_LOCK_IRQ

	select ARCH_INLINE_WRITE_LOCK_IRQSAVE

	select ARCH_INLINE_WRITE_TRYLOCK

	select ARCH_INLINE_WRITE_UNLOCK

	select ARCH_INLINE_WRITE_UNLOCK_BH

	select ARCH_INLINE_WRITE_UNLOCK_IRQ

	select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE

	select HAVE_UID16 if 32BIT

	select ARCH_SAVE_PAGE_KEYS if HIBERNATION

	select ARCH_WANT_IPC_PARSE_VERSION

	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT

	select BUILDTIME_EXTABLE_SORT

	select CLONE_BACKWARDS2

	select GENERIC_CLOCKEVENTS

	select GENERIC_CPU_DEVICES if !SMP

	select GENERIC_KERNEL_THREAD

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_TIME_VSYSCALL_OLD

	select GENERIC_CLOCKEVENTS

	select KTIME_SCALAR if 32BIT

	select HAVE_ALIGNED_STRUCT_PAGE if SLUB

	select HAVE_ARCH_JUMP_LABEL if !MARCH_G5

	select HAVE_ARCH_MUTEX_CPU_RELAX

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT

	select HAVE_BPF_JIT if 64BIT && PACK_STACK

	select HAVE_CMPXCHG_DOUBLE

	select HAVE_CMPXCHG_LOCAL

	select HAVE_C_RECORDMCOUNT

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DYNAMIC_FTRACE

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_LZO

	select HAVE_KERNEL_XZ

	select HAVE_KPROBES

	select HAVE_KRETPROBES

	select HAVE_KVM if 64BIT

	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK_NODE_MAP

	select HAVE_MOD_ARCH_SPECIFIC

	select HAVE_OPROFILE

	select HAVE_PERF_EVENTS

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_SYSCALL_WRAPPERS

	select HAVE_UID16 if 32BIT

	select HAVE_VIRT_CPU_ACCOUNTING

	select INIT_ALL_POSSIBLE

	select KTIME_SCALAR if 32BIT

	select MODULES_USE_ELF_RELA

	select CLONE_BACKWARDS2

	select SYSCTL_EXCEPTION_TRACE

	select USE_GENERIC_SMP_HELPERS if SMP

	select VIRT_CPU_ACCOUNTING



config SCHED_OMIT_FRAME_POINTER

	def_bool y

arch/s390/appldata/appldata_mem.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static void appldata_get_mem_data(void *data) 
	mem_data->totalswap = P2K(val.totalswap);

	mem_data->freeswap  = P2K(val.freeswap);



	mem_data->timestamp = get_clock();

	mem_data->timestamp = get_tod_clock();

	mem_data->sync_count_2++;

}

arch/s390/appldata/appldata_net_sum.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static void appldata_get_net_sum_data(void *data) 
	net_data->tx_dropped = tx_dropped;

	net_data->collisions = collisions;



	net_data->timestamp = get_clock();

	net_data->timestamp = get_tod_clock();

	net_data->sync_count_2++;

}

arch/s390/appldata/appldata_os.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static void appldata_get_os_data(void *data) 
		}

		ops.size = new_size;

	}

	os_data->timestamp = get_clock();

	os_data->timestamp = get_tod_clock();

	os_data->sync_count_2++;

}