History

Merge tag 'powerpc-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull powerpc updates from Michael Ellerman: "Highlights include: - Larger virtual address space on 64-bit server CPUs. By default we use a 128TB virtual address space, but a process can request access to the full 512TB by passing a hint to mmap(). - Support for the new Power9 "XIVE" interrupt controller. - TLB flushing optimisations for the radix MMU on Power9. - Support for CAPI cards on Power9, using the "Coherent Accelerator Interface Architecture 2.0". - The ability to configure the mmap randomisation limits at build and runtime. - Several small fixes and cleanups to the kprobes code, as well as support for KPROBES_ON_FTRACE. - Major improvements to handling of system reset interrupts, correctly treating them as NMIs, giving them a dedicated stack and using a new hypervisor call to trigger them, all of which should aid debugging and robustness. - Many fixes and other minor enhancements. Thanks to: Alastair D'Silva, Alexey Kardashevskiy, Alistair Popple, Andrew Donnellan, Aneesh Kumar K.V, Anshuman Khandual, Anton Blanchard, Balbir Singh, Ben Hutchings, Benjamin Herrenschmidt, Bhupesh Sharma, Chris Packham, Christian Zigotzky, Christophe Leroy, Christophe Lombard, Daniel Axtens, David Gibson, Gautham R. Shenoy, Gavin Shan, Geert Uytterhoeven, Guilherme G. Piccoli, Hamish Martin, Hari Bathini, Kees Cook, Laurent Dufour, Madhavan Srinivasan, Mahesh J Salgaonkar, Mahesh Salgaonkar, Masami Hiramatsu, Matt Brown, Matthew R. Ochs, Michael Neuling, Naveen N. Rao, Nicholas Piggin, Oliver O'Halloran, Pan Xinhui, Paul Mackerras, Rashmica Gupta, Russell Currey, Sukadev Bhattiprolu, Thadeu Lima de Souza Cascardo, Tobin C. Harding, Tyrel Datwyler, Uma Krishnan, Vaibhav Jain, Vipin K Parashar, Yang Shi" * tag 'powerpc-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (214 commits) powerpc/64s: Power9 has no LPCR[VRMASD] field so don't set it powerpc/powernv: Fix TCE kill on NVLink2 powerpc/mm/radix: Drop support for CPUs without lockless tlbie powerpc/book3s/mce: Move add_taint() later in virtual mode powerpc/sysfs: Move #ifdef CONFIG_HOTPLUG_CPU out of the function body powerpc/smp: Document irq enable/disable after migrating IRQs powerpc/mpc52xx: Don't select user-visible RTAS_PROC powerpc/powernv: Document cxl dependency on special case in pnv_eeh_reset() powerpc/eeh: Clean up and document event handling functions powerpc/eeh: Avoid use after free in eeh_handle_special_event() cxl: Mask slice error interrupts after first occurrence cxl: Route eeh events to all drivers in cxl_pci_error_detected() cxl: Force context lock during EEH flow powerpc/64: Allow CONFIG_RELOCATABLE if COMPILE_TEST powerpc/xmon: Teach xmon oops about radix vectors powerpc/mm/hash: Fix off-by-one in comment about kernel contexts ids powerpc/pseries: Enable VFIO powerpc/powernv: Fix iommu table size calculation hook for small tables powerpc/powernv: Check kzalloc() return value in pnv_pci_table_alloc powerpc: Add arch/powerpc/tools directory ...

Linus Torvalds committed 9 years ago

Commit 7246f602 parents e579dde 700b7ea212 files · +8698 −2790Browse files

Showing the changes to include/uapi/linux (1 of 212 files). Show all

Unified · Split

include/uapi/linux/perf_event.h+16−0
@@ -922,6 +922,7 @@ enum perf_callchain_context { · 921 unmodified lines
922#define PERF_FLAG_PID_CGROUP (1UL << 2) /* pid=cgroup id, per-cpu mode only */922#define PERF_FLAG_PID_CGROUP (1UL << 2) /* pid=cgroup id, per-cpu mode only */
923#define PERF_FLAG_FD_CLOEXEC (1UL << 3) /* O_CLOEXEC */923#define PERF_FLAG_FD_CLOEXEC (1UL << 3) /* O_CLOEXEC */
924 924
925#if defined(__LITTLE_ENDIAN_BITFIELD)
925union perf_mem_data_src {926union perf_mem_data_src {
926 __u64 val;927 __u64 val;
927 struct {928 struct {
@@ -933,6 +934,21 @@ union perf_mem_data_src { · 5 unmodified lines
933 mem_rsvd:31;934 mem_rsvd:31;
934 };935 };
935};936};
937#elif defined(__BIG_ENDIAN_BITFIELD)
938union perf_mem_data_src {
939 __u64 val;
940 struct {
941 __u64 mem_rsvd:31,
942 mem_dtlb:7, /* tlb access */
943 mem_lock:2, /* lock instr */
944 mem_snoop:5, /* snoop mode */
945 mem_lvl:14, /* memory hierarchy level */
946 mem_op:5; /* type of opcode */
947 };
948};
949#else
950#error "Unknown endianness"
951#endif
936 952
937/* type of opcode (load/store/prefetch,code) */953/* type of opcode (load/store/prefetch,code) */
938#define PERF_MEM_OP_NA 0x01 /* not available */954#define PERF_MEM_OP_NA 0x01 /* not available */