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

Commit 89af571c 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: (54 commits)
  [S390] tape: Use pr_xxx instead of dev_xxx in shared driver code
  [S390] Wire up page fault events for software perf counters.
  [S390] Remove smp_cpu_not_running.
  [S390] Get rid of cpuid.h header file.
  [S390] Limit cpu detection to 256 physical cpus.
  [S390] tape: Fix device online messages
  [S390] Enable guest page hinting by default.
  [S390] use generic scatterlist.h
  [S390] s390dbf: Add description for usage of "%s" in sprintf events
  [S390] Initialize __LC_THREAD_INFO early.
  [S390] fix recursive locking on page_table_lock
  [S390] kvm: use console_initcall() to initialize s390 virtio console
  [S390] tape: reversed order of labels
  [S390] hypfs: Use "%u" instead of "%d" for unsigned ints in snprintf
  [S390] kernel: Print an error message if kernel NSS cannot be defined
  [S390] zcrypt: Free ap_device if dev_set_name fails.
  [S390] zcrypt: Use spin_lock_bh in suspend callback
  [S390] xpram: Remove checksum validation for suspend/resume
  [S390] vmur: Invalid allocation sequence for vmur class
  [S390] hypfs: remove useless variable qname
  ...
parents 1b195b17 59e36927

Documentation/s390/s390dbf.txt

+7 −0
Original line number Diff line number Diff line
@@ -495,6 +495,13 @@ and for each vararg a long value. So e.g. for a debug entry with a format 
string plus two varargs one would need to allocate a (3 * sizeof(long)) 

byte data area in the debug_register() function.



IMPORTANT: Using "%s" in sprintf event functions is dangerous. You can only

use "%s" in the sprintf event functions, if the memory for the passed string is

available as long as the debug feature exists. The reason behind this is that

due to performance considerations only a pointer to the string is stored in

the debug feature. If you log a string that is freed afterwards, you will get

an OOPS when inspecting the debug feature, because then the debug feature will

access the already freed memory.



NOTE: If using the sprintf view do NOT use other event/exception functions

than the sprintf-event and -exception functions.

Documentation/sysctl/kernel.txt

+16 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ Currently, these files might (depending on your configuration) 
show up in /proc/sys/kernel:

- acpi_video_flags

- acct

- callhome		     [ S390 only ]

- auto_msgmni

- core_pattern

- core_uses_pid
@@ -91,6 +92,21 @@ valid for 30 seconds. 


==============================================================



callhome:



Controls the kernel's callhome behavior in case of a kernel panic.



The s390 hardware allows an operating system to send a notification

to a service organization (callhome) in case of an operating system panic.



When the value in this file is 0 (which is the default behavior)

nothing happens in case of a kernel panic. If this value is set to "1"

the complete kernel oops message is send to the IBM customer service

organization in case the mainframe the Linux operating system is running

on has a service contract with IBM.



==============================================================



core_pattern:



core_pattern is used to specify a core dumpfile pattern name.

arch/s390/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ config S390 
	select HAVE_ARCH_TRACEHOOK

	select INIT_ALL_POSSIBLE

	select HAVE_PERF_COUNTERS

	select GENERIC_ATOMIC64 if !64BIT



config SCHED_OMIT_FRAME_POINTER

	bool
@@ -481,13 +480,6 @@ config CMM_IUCV 
	  Select this option to enable the special message interface to

	  the cooperative memory management.



config PAGE_STATES

	bool "Unused page notification"

	help

	  This enables the notification of unused pages to the

	  hypervisor. The ESSA instruction is used to do the states

	  changes between a page that has content and the unused state.



config APPLDATA_BASE

	bool "Linux - VM Monitor Stream, base infrastructure"

	depends on PROC_FS

arch/s390/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -88,8 +88,7 @@ LDFLAGS_vmlinux := -e start 
head-y		:= arch/s390/kernel/head.o arch/s390/kernel/init_task.o



core-y		+= arch/s390/mm/ arch/s390/kernel/ arch/s390/crypto/ \

		   arch/s390/appldata/ arch/s390/hypfs/ arch/s390/kvm/ \

		   arch/s390/power/

		   arch/s390/appldata/ arch/s390/hypfs/ arch/s390/kvm/



libs-y		+= arch/s390/lib/

drivers-y	+= drivers/s390/

arch/s390/hypfs/inode.c

+1 −5
Original line number Diff line number Diff line
@@ -355,11 +355,7 @@ static struct dentry *hypfs_create_file(struct super_block *sb, 
{

	struct dentry *dentry;

	struct inode *inode;

	struct qstr qname;



	qname.name = name;

	qname.len = strlen(name);

	qname.hash = full_name_hash(name, qname.len);

	mutex_lock(&parent->d_inode->i_mutex);

	dentry = lookup_one_len(name, parent, strlen(name));

	if (IS_ERR(dentry)) {
@@ -426,7 +422,7 @@ struct dentry *hypfs_create_u64(struct super_block *sb, struct dentry *dir, 
	char tmp[TMP_SIZE];

	struct dentry *dentry;



	snprintf(tmp, TMP_SIZE, "%lld\n", (unsigned long long int)value);

	snprintf(tmp, TMP_SIZE, "%llu\n", (unsigned long long int)value);

	buffer = kstrdup(tmp, GFP_KERNEL);

	if (!buffer)

		return ERR_PTR(-ENOMEM);