History

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

David S. Miller committed 8 years ago

Commit f74290f2 parents 1b71af6 9cb9c07320 files · +2314 −1384Browse files

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

Unified · Split

2 files
  1. include/uapi/linux/ptrace.h +2 −2
  2. include/uapi/rdma/rdma_user_ioctl.h +2 −2
include/uapi/linux/ptrace.h+2−2
@@ -69,8 +69,8 @@ struct ptrace_peeksiginfo_args { · 68 unmodified lines
6969 #define PTRACE_SECCOMP_GET_METADATA 0x420d
7070
7171 struct seccomp_metadata {
72− unsigned long filter_off; /* Input: which filter */
73− unsigned int flags; /* Output: filter's flags */
72+ __u64 filter_off; /* Input: which filter */
73+ __u64 flags; /* Output: filter's flags */
7474 };
7575
7676 /* Read signals from a shared (process wide) queue */
include/uapi/rdma/rdma_user_ioctl.h+2−2
@@ -65,7 +65,7 @@ struct ib_uverbs_attr { · 64 unmodified lines
6565 __u16 len; /* only for pointers */
6666 __u16 flags; /* combination of UVERBS_ATTR_F_XXXX */
6767 __u16 reserved;
68− __u64 data; /* ptr to command, inline data or idr/fd */
68+ __aligned_u64 data; /* ptr to command, inline data or idr/fd */
6969 };
7070
7171 struct ib_uverbs_ioctl_hdr {
@@ -73,7 +73,7 @@ struct ib_uverbs_ioctl_hdr { · 1 unmodified line
7373 __u16 object_id;
7474 __u16 method_id;
7575 __u16 num_attrs;
76− __u64 reserved;
76+ __aligned_u64 reserved;
7777 struct ib_uverbs_attr attrs[0];
7878 };
7979

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