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

Commit 4cba84b5 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: (36 commits)
  [S390] Remove code duplication from monreader / dcssblk.
  [S390] kernel: show last breaking-event-address on oops
  [S390] lowcore: Change type of lowcores softirq_pending to __u32.
  [S390] zcrypt: Comments and kernel-doc cleanup
  [S390] uaccess: Always access the correct address space.
  [S390] Fix a lot of sparse warnings.
  [S390] Convert s390 to GENERIC_CLOCKEVENTS.
  [S390] genirq/clockevents: move irq affinity prototypes/inlines to interrupt.h
  [S390] Convert monitor calls to function calls.
  [S390] qdio (new feature): enhancing info-retrieval from QDIO-adapters
  [S390] replace remaining __FUNCTION__ occurrences
  [S390] remove redundant display of free swap space in show_mem()
  [S390] qdio: remove outdated developerworks link.
  [S390] Add debug_register_mode() function to debug feature API
  [S390] crypto: use more descriptive function names for init/exit routines.
  [S390] switch sched_clock to store-clock-extended.
  [S390] zcrypt: add support for large random numbers
  [S390] hw_random: allow rng_dev_read() to return hardware errors.
  [S390] Vertical cpu management.
  [S390] cpu topology support for s390.
  ...
parents 7d939fbd ca68305b

Documentation/s390/s390dbf.txt

+21 −0
Original line number Diff line number Diff line
@@ -115,6 +115,27 @@ Return Value: Handle for generated debug area 
Description:  Allocates memory for a debug log     

              Must not be called within an interrupt handler 



----------------------------------------------------------------------------

debug_info_t *debug_register_mode(char *name, int pages, int nr_areas,

				  int buf_size, mode_t mode, uid_t uid,

				  gid_t gid);



Parameter:    name:	   Name of debug log (e.g. used for debugfs entry)

	      pages:	   Number of pages, which will be allocated per area

	      nr_areas:    Number of debug areas

	      buf_size:    Size of data area in each debug entry

	      mode:	   File mode for debugfs files. E.g. S_IRWXUGO

	      uid:	   User ID for debugfs files. Currently only 0 is

			   supported.

	      gid:	   Group ID for debugfs files. Currently only 0 is

			   supported.



Return Value: Handle for generated debug area

	      NULL if register failed



Description:  Allocates memory for a debug log

	      Must not be called within an interrupt handler



---------------------------------------------------------------------------

void debug_unregister (debug_info_t * id);

arch/s390/Kconfig

+10 −23
Original line number Diff line number Diff line
@@ -3,6 +3,10 @@ 
# see Documentation/kbuild/kconfig-language.txt.

#



config SCHED_MC

	def_bool y

	depends on SMP



config MMU

	def_bool y
@@ -39,6 +43,9 @@ config GENERIC_HWEIGHT 
config GENERIC_TIME

	def_bool y



config GENERIC_CLOCKEVENTS

	def_bool y



config GENERIC_BUG

	bool

	depends on BUG
@@ -69,6 +76,8 @@ menu "Base setup" 


comment "Processor type and features"



source "kernel/time/Kconfig"



config 64BIT

	bool "64 bit kernel"

	help
@@ -301,10 +310,7 @@ config QDIO 
	tristate "QDIO support"

	---help---

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

	  IBM mainframes.



	  For details please refer to the documentation provided by IBM at

	  <http://www10.software.ibm.com/developerworks/opensource/linux390>

	  IBM System z.



	  To compile this driver as a module, choose M here: the

	  module will be called qdio.
@@ -486,25 +492,6 @@ config APPLDATA_NET_SUM 


source kernel/Kconfig.hz



config NO_IDLE_HZ

	bool "No HZ timer ticks in idle"

	help

	  Switches the regular HZ timer off when the system is going idle.

	  This helps z/VM to detect that the Linux system is idle. VM can

	  then "swap-out" this guest which reduces memory usage. It also

	  reduces the overhead of idle systems.



	  The HZ timer can be switched on/off via /proc/sys/kernel/hz_timer.

	  hz_timer=0 means HZ timer is disabled. hz_timer=1 means HZ

	  timer is active.



config NO_IDLE_HZ_INIT

	bool "HZ timer in idle off by default"

	depends on NO_IDLE_HZ

	help

	  The HZ timer is switched off in idle by default. That means the

	  HZ timer is already disabled at boot time.



config S390_HYPFS_FS

	bool "s390 hypervisor file system support"

	select SYS_HYPERVISOR

arch/s390/crypto/aes_s390.c

+4 −4
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ static struct crypto_alg cbc_aes_alg = { 
	}

};



static int __init aes_init(void)

static int __init aes_s390_init(void)

{

	int ret;
@@ -542,15 +542,15 @@ static int __init aes_init(void) 
	goto out;

}



static void __exit aes_fini(void)

static void __exit aes_s390_fini(void)

{

	crypto_unregister_alg(&cbc_aes_alg);

	crypto_unregister_alg(&ecb_aes_alg);

	crypto_unregister_alg(&aes_alg);

}



module_init(aes_init);

module_exit(aes_fini);

module_init(aes_s390_init);

module_exit(aes_s390_fini);



MODULE_ALIAS("aes");

arch/s390/crypto/des_s390.c

+4 −4
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ static struct crypto_alg cbc_des3_192_alg = { 
	}

};



static int init(void)

static int des_s390_init(void)

{

	int ret = 0;
@@ -612,7 +612,7 @@ static int init(void) 
	goto out;

}



static void __exit fini(void)

static void __exit des_s390_fini(void)

{

	crypto_unregister_alg(&cbc_des3_192_alg);

	crypto_unregister_alg(&ecb_des3_192_alg);
@@ -625,8 +625,8 @@ static void __exit fini(void) 
	crypto_unregister_alg(&des_alg);

}



module_init(init);

module_exit(fini);

module_init(des_s390_init);

module_exit(des_s390_fini);



MODULE_ALIAS("des");

MODULE_ALIAS("des3_ede");

arch/s390/crypto/sha1_s390.c

+4 −4
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static struct crypto_alg alg = { 
	.dia_final	=	sha1_final } }

};



static int __init init(void)

static int __init sha1_s390_init(void)

{

	if (!crypt_s390_func_available(KIMD_SHA_1))

		return -EOPNOTSUPP;
@@ -145,13 +145,13 @@ static int __init init(void) 
	return crypto_register_alg(&alg);

}



static void __exit fini(void)

static void __exit sha1_s390_fini(void)

{

	crypto_unregister_alg(&alg);

}



module_init(init);

module_exit(fini);

module_init(sha1_s390_init);

module_exit(sha1_s390_fini);



MODULE_ALIAS("sha1");