diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2017-02-18 21:37:14 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-02-18 21:37:14 +1100 |
| commit | 6c8f9ad566ddc63da5da84c3c9e6c1bb0434c64f (patch) | |
| tree | 1ba41dcec5d5a3a7fff8643d5d28fe24bfc50798 /arch/powerpc/include/asm/processor.h | |
| parent | d11914b21c4c21a294fe8937d66c1a192caa3cad (diff) | |
| parent | 75b824727680a9d12c34d78096a5ac642e53f5d0 (diff) | |
| download | op-kernel-dev-6c8f9ad566ddc63da5da84c3c9e6c1bb0434c64f.zip op-kernel-dev-6c8f9ad566ddc63da5da84c3c9e6c1bb0434c64f.tar.gz | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include 8xx breakpoints and perf, t1042rdb display support,
and board updates."
Diffstat (limited to 'arch/powerpc/include/asm/processor.h')
| -rw-r--r-- | arch/powerpc/include/asm/processor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h index 21e0b52..e0fecbc 100644 --- a/arch/powerpc/include/asm/processor.h +++ b/arch/powerpc/include/asm/processor.h @@ -225,6 +225,7 @@ struct thread_struct { #ifdef CONFIG_PPC64 unsigned long start_tb; /* Start purr when proc switched in */ unsigned long accum_tb; /* Total accumulated purr for process */ +#endif #ifdef CONFIG_HAVE_HW_BREAKPOINT struct perf_event *ptrace_bps[HBP_NUM]; /* @@ -233,7 +234,6 @@ struct thread_struct { */ struct perf_event *last_hit_ubp; #endif /* CONFIG_HAVE_HW_BREAKPOINT */ -#endif struct arch_hw_breakpoint hw_brk; /* info on the hardware breakpoint */ unsigned long trap_nr; /* last trap # on this thread */ u8 load_fp; |
