29 Oct, 2010

13 commits

  • * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
    [S390] fix kprobes single stepping
    [S390] tape: fix dbf usage
    [S390] dasd: provide a Sense Path Group ID ioctl
    [S390] ftrace: select HAVE_C_RECORDMCOUNT
    [S390] vdso: get rid of redefinition warnings
    [S390] facility detection: remove unused variable
    [S390] hypfs: Fix error handling in hypfs_diag initialization
    [S390] topology: fix cpu masks for topology=off case
    [S390] topology: add SCHED_MC config option
    [S390] Kconfig: add machine type number to code generation options
    [S390] Add z196 machine type to setup_hwcaps

    Linus Torvalds
     
  • Fix kprobes after git commit 1e54622e0403891b10f2105663e0f9dd595a1f17
    broke it. The kprobe_handler is now called with interrupts in the state
    at the time of the breakpoint. The single step of the replaced instruction
    is done with interrupts off which makes it necessary to enable and disable
    the interupts in the kprobes code.

    Signed-off-by: Martin Schwidefsky

    Martin Schwidefsky
     
  • The BIODASDSNID ioctl executes a 'Sense Path Group ID'
    command on a DASD ECKD device. The returned path group data
    allows user space programs to determine path state and
    path group ID of the channel paths to the device.

    Signed-off-by: Stefan Weinhuber
    Signed-off-by: Martin Schwidefsky

    Stefan Weinhuber
     
  • Select HAVE_C_RECORDMCOUNT for the fast C version of recordmcount.

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

    Heiko Carstens
     
  • The CLOCK_* defines in asm-offsets.c are only used for the vdso code
    however in the meantime they cause other trouble.
    Just rename them to get permanently rid of this:

    In file included from /home2/heicarst/linux-2.6/arch/s390/include/asm/asm-offsets.h:1:0,
    from arch/s390/mm/fault.c:33:
    include/generated/asm-offsets.h:53:0: warning: "CLOCK_REALTIME" redefined
    include/linux/time.h:286:0: note: this is the location of the previous definition
    include/generated/asm-offsets.h:54:0: warning: "CLOCK_MONOTONIC" redefined
    include/linux/time.h:287:0: note: this is the location of the previous definition

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

    Heiko Carstens
     
  • arch/s390/kernel/early.c: In function 'setup_hpage':
    arch/s390/kernel/early.c:285:15: warning: unused variable 'facilities'

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

    Heiko Carstens
     
  • Fix the following two error handling bugs in hypfs_diag_init():
    * No need for calling diag204_free_buffer()
    * Initialize name table only in case of LPAR and prevent error message
    on non-LPAR systems.

    Signed-off-by: Michael Holzheu
    Signed-off-by: Martin Schwidefsky

    Michael Holzheu
     
  • Fix cpu masks for 'topology=off' case. Folding of the scheduling domains
    happen in such a way that everything belongs to the MC domain instead
    of the CPU doimain.
    This should fix a performance regression introduced with
    eafd2b6d "[S390] topology: use default MC domain initializer" and also
    makes sure we have the same behavious as if CONFIG_SCHED_MC was not
    selected at all.

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

    Heiko Carstens
     
  • This allows us to easily check for performance differences seen with
    !CONFIG_SCHED_MC and topology=off.
    Actually there shouldn't be any (besides a small overhead because of
    additional code).

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

    Heiko Carstens
     
  • Add machine type number to code generation options. Also clean up and
    shorten quite a lot of help texts with respect to machine type and
    architecture terminology.

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

    Heiko Carstens
     
  • Add machine type for zEnterprise 196 to elf platform detection.

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

    Heiko Carstens
     
  • Signed-off-by: Al Viro

    Al Viro
     
  • * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (38 commits)
    kbuild: convert `arch/tile' to the kconfig mainmenu upgrade
    README: cite nconfig
    Revert "kconfig: Temporarily disable dependency warnings"
    kconfig: Use PATH_MAX instead of 128 for path buffer sizes.
    kconfig: Fix realloc usage()
    kconfig: Propagate const
    kconfig: Don't go out from read config loop when you read new symbol
    kconfig: fix menuconfig on debian lenny
    kbuild: migrate all arch to the kconfig mainmenu upgrade
    kconfig: expand file names
    kconfig: use the file's name of sourced file
    kconfig: constify file name
    kconfig: don't emit warning upon rootmenu's prompt redefinition
    kconfig: replace KERNELVERSION usage by the mainmenu's prompt
    kconfig: delay gconf window initialization
    kconfig: expand by default the rootmenu's prompt
    kconfig: add a symbol string expansion helper
    kconfig: regen parser
    kconfig: implement the `mainmenu' directive
    kconfig: allow PACKAGE to be defined on the compiler's command-line
    ...

    Fix up trivial conflict in arch/mn10300/Kconfig

    Linus Torvalds
     

28 Oct, 2010

2 commits

  • The taskstats interface uses microsecond granularity for the user and
    system time values. The conversion from cputime to the taskstats values
    uses the cputime_to_msecs primitive which effectively limits the
    granularity to milliseconds. Add the cputime_to_usecs primitive for
    architectures that have better, more precise CPU time values. Remove
    cputime_to_msecs primitive because there are no more users left.

    Signed-off-by: Michael Holzheu
    Acked-by: Balbir Singh
    Cc: Luck Tony
    Cc: Shailabh Nagar
    Cc: Martin Schwidefsky
    Cc: Oleg Nesterov
    Cc: Benjamin Herrenschmidt
    Cc: Heiko Carstens
    Cc: Thomas Gleixner
    Cc: Shailabh Nagar
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Michael Holzheu
     
  • Fix up the arguments to arch_ptrace() to take account of the fact that
    @addr and @data are now unsigned long rather than long as of a preceding
    patch in this series.

    Signed-off-by: Namhyung Kim
    Cc:
    Acked-by: Roland McGrath
    Acked-by: David Howells
    Acked-by: Geert Uytterhoeven
    Acked-by: David S. Miller
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Namhyung Kim
     

27 Oct, 2010

1 commit

  • Since we no longer need to provide KM_type, the whole pte_*map_nested()
    API is now redundant, remove it.

    Signed-off-by: Peter Zijlstra
    Acked-by: Chris Metcalf
    Cc: David Howells
    Cc: Hugh Dickins
    Cc: Rik van Riel
    Cc: Ingo Molnar
    Cc: Thomas Gleixner
    Cc: "H. Peter Anvin"
    Cc: Steven Rostedt
    Cc: Russell King
    Cc: Ralf Baechle
    Cc: David Miller
    Cc: Paul Mackerras
    Cc: Benjamin Herrenschmidt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Peter Zijlstra
     

25 Oct, 2010

24 commits