History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

David S. Miller committed 8 years ago

Commit c749fa12 parents 16f4faa 3be4aaf221 files · +2739 −1485Browse files

Showing the changes to include/uapi/linux (2 of 221 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/perf_event.h +15 −3
  2. include/uapi/linux/random.h +3 −0
include/uapi/linux/perf_event.h+15−3
@@ -650,11 +650,23 @@ struct perf_event_mmap_page { · 649 unmodified lines
650#define PERF_RECORD_MISC_COMM_EXEC (1 << 13)650#define PERF_RECORD_MISC_COMM_EXEC (1 << 13)
651#define PERF_RECORD_MISC_SWITCH_OUT (1 << 13)651#define PERF_RECORD_MISC_SWITCH_OUT (1 << 13)
652/*652/*
653 * Indicates that the content of PERF_SAMPLE_IP points to653 * These PERF_RECORD_MISC_* flags below are safely reused
654 * the actual instruction that triggered the event. See also654 * for the following events:
655 * perf_event_attr::precise_ip.655 *
656 * PERF_RECORD_MISC_EXACT_IP - PERF_RECORD_SAMPLE of precise events
657 * PERF_RECORD_MISC_SWITCH_OUT_PREEMPT - PERF_RECORD_SWITCH* events
658 *
659 *
660 * PERF_RECORD_MISC_EXACT_IP:
661 * Indicates that the content of PERF_SAMPLE_IP points to
662 * the actual instruction that triggered the event. See also
663 * perf_event_attr::precise_ip.
664 *
665 * PERF_RECORD_MISC_SWITCH_OUT_PREEMPT:
666 * Indicates that thread was preempted in TASK_RUNNING state.
656 */667 */
657#define PERF_RECORD_MISC_EXACT_IP (1 << 14)668#define PERF_RECORD_MISC_EXACT_IP (1 << 14)
669#define PERF_RECORD_MISC_SWITCH_OUT_PREEMPT (1 << 14)
658/*670/*
659 * Reserve the last bit to indicate some extended misc field671 * Reserve the last bit to indicate some extended misc field
660 */672 */
include/uapi/linux/random.h+3−0
@@ -35,6 +35,9 @@ · 34 unmodified lines
35/* Clear the entropy pool and associated counters. (Superuser only.) */35/* Clear the entropy pool and associated counters. (Superuser only.) */
36#define RNDCLEARPOOL _IO( 'R', 0x06 )36#define RNDCLEARPOOL _IO( 'R', 0x06 )
37 37
38/* Reseed CRNG. (Superuser only.) */
39#define RNDRESEEDCRNG _IO( 'R', 0x07 )
40
38struct rand_pool_info {41struct rand_pool_info {
39 int entropy_count;42 int entropy_count;
40 int buf_size;43 int buf_size;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t