linux-stable.git/arch/s390/include/asm/setup.h, branch linux-3.7.y

Merge tag 'disintegrate-s390-20121009' of

2012-10-09T12:18:10+00:00

git://git.infradead.org/users/dhowells/linux-headers

Pull UAPI patchset from David Howells:
 "Can you merge the following branch into the s390 tree please.
  This is to complete part of the UAPI disintegration for which the
  preparatory patches were pulled recently."

Conflicts:
	arch/s390/include/asm/chpid.h

s390/mm: use pfmf instruction to initialize storage keys

2012-10-09T12:16:55+00:00

Make use of the pfmf instruction, if available, to initialize storage keys
of whole 1MB or 2GB frames instead of initializing every single page with
the sske instruction.

Signed-off-by: Heiko Carstens 
Signed-off-by: Martin Schwidefsky

s390/facilities: cleanup PFMF and HPAGE machine facility detection

2012-10-09T12:16:55+00:00

MACHINE_HAS_PFMF and MACHINE_HAS_HPAGE actually have the same semantics:
the cpu has the EDAT1 facility installed in zArch mode. So remove one
of the feature flags in machine_flags and rename the other one to EDAT1.

The two old macros simply get mapped to MACHINE_HAS_EDAT1.

Signed-off-by: Heiko Carstens 
Signed-off-by: Martin Schwidefsky

UAPI: (Scripted) Disintegrate arch/s390/include/asm

2012-10-09T08:47:31+00:00

Signed-off-by: David Howells 
Acked-by: Arnd Bergmann 
Acked-by: Thomas Gleixner 
Acked-by: Michael Kerrisk 
Acked-by: Paul E. McKenney 
Acked-by: Dave Jones

thp, s390: architecture backend for thp on s390

2012-10-09T07:22:31+00:00

This implements the architecture backend for transparent hugepages
on s390.

Signed-off-by: Gerald Schaefer 
Cc: Andrea Arcangeli 
Cc: Andi Kleen 
Cc: Hugh Dickins 
Cc: Hillf Danton 
Cc: Martin Schwidefsky 
Cc: Heiko Carstens 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

s390/mm: rename addressing_mode to s390_user_mode

2012-09-26T13:45:05+00:00

Renaming the globally visible variable "user_mode" to "addressing_mode" in
order to fix a name clash was not a good idea. (Commit 37fe1d73 "s390/mm:
rename user_mode variable to addressing_mode")
Looking at the code after a couple of weeks one thinks: addressing mode of
what?
So rename the variable again. This time to s390_user_mode. Which hopefully
makes more sense.

Signed-off-by: Heiko Carstens 
Signed-off-by: Martin Schwidefsky

s390: add support for transactional memory

2012-09-26T13:45:02+00:00

Allow user-space processes to use transactional execution (TX).
If the TX facility is available user space programs can use
transactions for fine-grained serialization based on the data
objects that are referenced during a transaction. This is
useful for lockless data structures and speculative compiler
optimizations.

Signed-off-by: Martin Schwidefsky

s390/mm: rename user_mode variable to addressing_mode

2012-07-30T09:03:11+00:00

Fix name clash with user_mode() define which is also used in common code.

Signed-off-by: Heiko Carstens 
Signed-off-by: Martin Schwidefsky

s390/comments: unify copyright messages and remove file names

2012-07-20T09:15:04+00:00

Remove the file name from the comment at top of many files. In most
cases the file name was wrong anyway, so it's rather pointless.

Also unify the IBM copyright statement. We did have a lot of sightly
different statements and wanted to change them one after another
whenever a file gets touched. However that never happened. Instead
people start to take the old/"wrong" statements to use as a template
for new files.
So unify all of them in one go.

Signed-off-by: Heiko Carstens

s390/headers: replace s390x with CONFIG_64BIT where possible

2012-05-24T08:10:10+00:00

Replace __s390x__ with CONFIG_64BIT in all places that are not exported
to userspace or guarded with #ifdef __KERNEL__.

Signed-off-by: Heiko Carstens 
Signed-off-by: Martin Schwidefsky