History

Merge branch 'sched/urgent' into sched/core, to pick up fixes and refresh the branch

Ingo Molnar committed 3 years ago

Commit 8db30572 parents d4d6596 9e0bc36950 files · +8547 −5075Browse files

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

Unified · Split

2 files
  1. include/uapi/linux/bpf.h +3 −1
  2. include/uapi/linux/stddef.h +7 −0
include/uapi/linux/bpf.h+3−1
@@ -1962,7 +1962,9 @@ union bpf_attr { · 1961 unmodified lines
19621962 * performed again, if the helper is used in combination with
19631963 * direct packet access.
19641964 * Return
1965− * 0 on success, or a negative error in case of failure.
1965+ * 0 on success, or a negative error in case of failure. Positive
1966+ * error indicates a potential drop or congestion in the target
1967+ * device. The particular positive error codes are not defined.
19661968 *
19671969 * u64 bpf_get_current_pid_tgid(void)
19681970 * Description
include/uapi/linux/stddef.h+7−0
@@ -29,6 +29,11 @@ · 28 unmodified lines
2929 struct TAG { MEMBERS } ATTRS NAME; \
3030 }
3131
32+#ifdef __cplusplus
33+/* sizeof(struct{}) is 1 in C++, not 0, can't use C version of the macro. */
34+#define __DECLARE_FLEX_ARRAY(T, member) \
35+ T member[0]
36+#else
3237 /**
3338 * __DECLARE_FLEX_ARRAY() - Declare a flexible array usable in a union
3439 *
@@ -49,3 +54,5 @@ · 14 unmodified lines
4954 #ifndef __counted_by
5055 #define __counted_by(m)
5156 #endif
57+
58+#endif /* _UAPI_LINUX_STDDEF_H */

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