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

Commit 1db2a5c1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (85 commits)
  [S390] provide documentation for hvc_iucv kernel parameter.
  [S390] convert ctcm printks to dev_xxx and pr_xxx macros.
  [S390] convert zfcp printks to pr_xxx macros.
  [S390] convert vmlogrdr printks to pr_xxx macros.
  [S390] convert zfcp dumper printks to pr_xxx macros.
  [S390] convert cpu related printks to pr_xxx macros.
  [S390] convert qeth printks to dev_xxx and pr_xxx macros.
  [S390] convert sclp printks to pr_xxx macros.
  [S390] convert iucv printks to dev_xxx and pr_xxx macros.
  [S390] convert ap_bus printks to pr_xxx macros.
  [S390] convert dcssblk and extmem printks messages to pr_xxx macros.
  [S390] convert monwriter printks to pr_xxx macros.
  [S390] convert s390 debug feature printks to pr_xxx macros.
  [S390] convert monreader printks to pr_xxx macros.
  [S390] convert appldata printks to pr_xxx macros.
  [S390] convert setup printks to pr_xxx macros.
  [S390] convert hypfs printks to pr_xxx macros.
  [S390] convert time printks to pr_xxx macros.
  [S390] convert cpacf printks to pr_xxx macros.
  [S390] convert cio printks to pr_xxx macros.
  ...
parents a39b8633 cef7125d

Documentation/kernel-parameters.txt

+11 −0
Original line number Diff line number Diff line
@@ -823,6 +823,9 @@ and is between 256 and 4096 characters. It is defined in the file 


	hlt		[BUGS=ARM,SH]



	hvc_iucv=	[S390] Number of z/VM IUCV Hypervisor console (HVC)

			       back-ends. Valid parameters: 0..8



	i8042.debug	[HW] Toggle i8042 debug mode

	i8042.direct	[HW] Put keyboard port into non-translated mode

	i8042.dumbkbd	[HW] Pretend that controller can only read data from
@@ -2292,6 +2295,14 @@ and is between 256 and 4096 characters. It is defined in the file 
			See comment before function dc390_setup() in

			drivers/scsi/tmscsim.c.



	topology=	[S390]

			Format: {off | on}

			Specify if the kernel should make use of the cpu

			topology informations if the hardware supports these.

			The scheduler will make use of these informations and

			e.g. base its process migration decisions on it.

			Default is off.



	tp720=		[HW,PS2]



	trix=		[HW,OSS] MediaTrix AudioTrix Pro

arch/powerpc/include/asm/elf.h

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ extern int ucache_bsize; 
#define ARCH_HAS_SETUP_ADDITIONAL_PAGES

struct linux_binprm;

extern int arch_setup_additional_pages(struct linux_binprm *bprm,

				       int executable_stack);

				       int uses_interp);

#define VDSO_AUX_ENT(a,b) NEW_AUX_ENT(a,b);



#endif /* __KERNEL__ */

arch/powerpc/kernel/vdso.c

+1 −2
Original line number Diff line number Diff line
@@ -184,8 +184,7 @@ static void dump_vdso_pages(struct vm_area_struct * vma) 
 * This is called from binfmt_elf, we create the special vma for the

 * vDSO and insert it into the mm struct tree

 */

int arch_setup_additional_pages(struct linux_binprm *bprm,

				int executable_stack)

int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)

{

	struct mm_struct *mm = current->mm;

	struct page **vdso_pagelist;

arch/s390/Kconfig

+17 −24
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ config GENERIC_HWEIGHT 
config GENERIC_TIME

	def_bool y



config GENERIC_TIME_VSYSCALL

	def_bool y



config GENERIC_CLOCKEVENTS

	def_bool y
@@ -66,10 +69,15 @@ config PGSTE 
	bool

	default y if KVM



config VIRT_CPU_ACCOUNTING

	def_bool y



mainmenu "Linux Kernel Configuration"



config S390

	def_bool y

	select USE_GENERIC_SMP_HELPERS if SMP

	select HAVE_FUNCTION_TRACER

	select HAVE_OPROFILE

	select HAVE_KPROBES

	select HAVE_KRETPROBES
@@ -225,6 +233,14 @@ config MARCH_Z9_109 
	  Class (z9 BC). The kernel will be slightly faster but will not

	  work on older machines such as the z990, z890, z900, and z800.



config MARCH_Z10

	bool "IBM System z10"

	help

	  Select this to enable optimizations for IBM System z10. The

	  kernel will be slightly faster but will not work on older

	  machines such as the z990, z890, z900, z800, z9-109, z9-ec

	  and z9-bc.



endchoice



config PACK_STACK
@@ -343,16 +359,6 @@ config QDIO 


	  If unsure, say Y.



config QDIO_DEBUG

	bool "Extended debugging information"

	depends on QDIO

	help

	  Say Y here to get extended debugging output in

	    /sys/kernel/debug/s390dbf/qdio...

	  Warning: this option reduces the performance of the QDIO module.



	  If unsure, say N.



config CHSC_SCH

	tristate "Support for CHSC subchannels"

	help
@@ -466,22 +472,9 @@ config PAGE_STATES 
	  hypervisor. The ESSA instruction is used to do the states

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



config VIRT_TIMER

	bool "Virtual CPU timer support"

	help

	  This provides a kernel interface for virtual CPU timers.

	  Default is disabled.



config VIRT_CPU_ACCOUNTING

	bool "Base user process accounting on virtual cpu timer"

	depends on VIRT_TIMER

	help

	  Select this option to use CPU timer deltas to do user

	  process accounting.



config APPLDATA_BASE

	bool "Linux - VM Monitor Stream, base infrastructure"

	depends on PROC_FS && VIRT_TIMER=y

	depends on PROC_FS

	help

	  This provides a kernel interface for creating and updating z/VM APPLDATA

	  monitor records. The monitor records are updated at certain time

arch/s390/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ cflags-$(CONFIG_MARCH_G5) += $(call cc-option,-march=g5) 
cflags-$(CONFIG_MARCH_Z900) += $(call cc-option,-march=z900)

cflags-$(CONFIG_MARCH_Z990) += $(call cc-option,-march=z990)

cflags-$(CONFIG_MARCH_Z9_109) += $(call cc-option,-march=z9-109)

cflags-$(CONFIG_MARCH_Z10) += $(call cc-option,-march=z10)



#KBUILD_IMAGE is necessary for make rpm

KBUILD_IMAGE	:=arch/s390/boot/image