[tip:sched/core] cputime: Restore CPU_ACCOUNTING config defaults for PPC64

[tip-bot for Stephen Rothwell]

Commit-ID:  02fc8d37229d15c654876cf9ce56b5c1cf7945d7
Gitweb: http://git.kernel.org/tip/02fc8d37229d15c654876cf9ce56b5c1cf7945d7
Author: Stephen Rothwell 
AuthorDate: Fri, 8 Feb 2013 14:19:38 +1100
Committer:  Ingo Molnar 
CommitDate: Fri, 8 Feb 2013 15:23:12 +0100

cputime: Restore CPU_ACCOUNTING config defaults for PPC64

Commit abf917cd91cb ("cputime: Generic on-demand virtual cputime
accounting") inadvertantly changed the default CPU_ACCOUNTING
config for PPC64.  Repair that.

Signed-off-by: Stephen Rothwell 
Acked-by: Frederic Weisbecker 
Cc: Li Zhong 
Cc: Namhyung Kim 
Cc: Paul E. McKenney 
Cc: Paul Gortmaker 
Cc: Peter Zijlstra 
Cc: Steven Rostedt 
Cc: ppc-dev 
Cc: Benjamin Herrenschmidt 
Link: 
http://lkml.kernel.org/r/20130208141938.f31b7b9e1acac5bbe769e...@canb.auug.org.au
Signed-off-by: Ingo Molnar 
---
 init/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init/Kconfig b/init/Kconfig
index a05f843..ccb9f8f 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -332,7 +332,7 @@ config VIRT_CPU_ACCOUNTING
 choice
prompt "Cputime accounting"
default TICK_CPU_ACCOUNTING if !PPC64
-   default VIRT_CPU_ACCOUNTING if PPC64
+   default VIRT_CPU_ACCOUNTING_NATIVE if PPC64
 
 # Kind of a stub config for the pure tick based cputime accounting
 config TICK_CPU_ACCOUNTING
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

[tip:perf/urgent] tracing, powerpc: Fix for tracepoint API change

[tip-bot for Stephen Rothwell]

Commit-ID:  a578f4255763514dc9d0c4f2a60cf5b9323e0b6b
Gitweb: http://git.kernel.org/tip/a578f4255763514dc9d0c4f2a60cf5b9323e0b6b
Author: Stephen Rothwell 
AuthorDate: Fri, 28 May 2010 15:08:42 +1000
Committer:  Ingo Molnar 
CommitDate: Fri, 28 May 2010 16:27:11 +0200

tracing, powerpc: Fix for tracepoint API change

Commit 38516ab59fbc5b3bb278cf5e1fe2867c70cff32e "tracing: Let
tracepoints have data passed to tracepoint callbacks" requires
this fixup to the powerpc code.

Signed-off-by: Stephen Rothwell 
Acked-by: Steven Rostedt 
Cc: Linus 
Cc: Peter Zijlstra 
Cc: ppc-dev 
Cc: pau...@samba.org
Cc: Anton Blanchard ZZ 
LKML-Reference: <20100528150842.d5a751ba@canb.auug.org.au>
Signed-off-by: Ingo Molnar 
---
 arch/powerpc/platforms/pseries/hvCall_inst.c |   10 +-
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/platforms/pseries/hvCall_inst.c 
b/arch/powerpc/platforms/pseries/hvCall_inst.c
index 1fefae7..e19ff02 100644
--- a/arch/powerpc/platforms/pseries/hvCall_inst.c
+++ b/arch/powerpc/platforms/pseries/hvCall_inst.c
@@ -102,7 +102,7 @@ static const struct file_operations hcall_inst_seq_fops = {
 #define CPU_NAME_BUF_SIZE  32
 
 
-static void probe_hcall_entry(unsigned long opcode, unsigned long *args)
+static void probe_hcall_entry(void *ignored, unsigned long opcode, unsigned 
long *args)
 {
struct hcall_stats *h;
 
@@ -114,7 +114,7 @@ static void probe_hcall_entry(unsigned long opcode, 
unsigned long *args)
h->purr_start = mfspr(SPRN_PURR);
 }
 
-static void probe_hcall_exit(unsigned long opcode, unsigned long retval,
+static void probe_hcall_exit(void *ignored, unsigned long opcode, unsigned 
long retval,
 unsigned long *retbuf)
 {
struct hcall_stats *h;
@@ -140,11 +140,11 @@ static int __init hcall_inst_init(void)
if (!firmware_has_feature(FW_FEATURE_LPAR))
return 0;
 
-   if (register_trace_hcall_entry(probe_hcall_entry))
+   if (register_trace_hcall_entry(probe_hcall_entry, NULL))
return -EINVAL;
 
-   if (register_trace_hcall_exit(probe_hcall_exit)) {
-   unregister_trace_hcall_entry(probe_hcall_entry);
+   if (register_trace_hcall_exit(probe_hcall_exit, NULL)) {
+   unregister_trace_hcall_entry(probe_hcall_entry, NULL);
return -EINVAL;
}
 
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev