History

Merge tag 'char-misc-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver updates from Greg KH: "Here is the big set of various smaller driver subsystem updates for 5.13-rc1. Major bits in here are: - habanalabs driver updates - hwtracing driver updates - interconnect driver updates - mhi driver updates - extcon driver updates - fpga driver updates - new binder features added - nvmem driver updates - phy driver updates - soundwire driver updates - smaller misc and char driver fixes and updates. - bluetooth driver bugfix that maintainer wanted to go through this tree. All of these have been in linux-next with no reported issues" * tag 'char-misc-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (330 commits) bluetooth: eliminate the potential race condition when removing the HCI controller coresight: etm-perf: Fix define build issue when built as module phy: Revert "phy: ti: j721e-wiz: add missing of_node_put" phy: ti: j721e-wiz: Add missing include linux/slab.h phy: phy-twl4030-usb: Fix possible use-after-free in twl4030_usb_remove() stm class: Use correct UUID APIs intel_th: pci: Add Alder Lake-M support intel_th: pci: Add Rocket Lake CPU support intel_th: Consistency and off-by-one fix intel_th: Constify attribute_group structs intel_th: Constify all drvdata references stm class: Remove an unused function habanalabs/gaudi: Fix uninitialized return code rc when read size is zero greybus: es2: fix kernel-doc warnings mei: me: add Alder Lake P device id. dw-xdata-pcie: Update outdated info and improve text format dw-xdata-pcie: Fix documentation build warns fbdev: zero-fill colormap in fbcmap.c firmware: qcom-scm: Fix QCOM_SCM configuration speakup: i18n: Switch to kmemdup_nul() in spk_msg_set() ...

Linus Torvalds committed 5 years ago

Commit 8e3a3242 parents 90035c2 e2cb6b8216 files · +16281 −1994Browse files

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

Unified · Split

2 files
  1. include/uapi/linux/android/binder.h +28 −0
  2. include/uapi/linux/map_to_7segment.h +0 −14
include/uapi/linux/android/binder.h+28−0
@@ -217,6 +217,18 @@ struct binder_node_info_for_ref { · 216 unmodified lines
217217 __u32 reserved3;
218218 };
219219
220+struct binder_freeze_info {
221+ __u32 pid;
222+ __u32 enable;
223+ __u32 timeout_ms;
224+};
225+
226+struct binder_frozen_status_info {
227+ __u32 pid;
228+ __u32 sync_recv;
229+ __u32 async_recv;
230+};
231+
220232 #define BINDER_WRITE_READ _IOWR('b', 1, struct binder_write_read)
221233 #define BINDER_SET_IDLE_TIMEOUT _IOW('b', 3, __s64)
222234 #define BINDER_SET_MAX_THREADS _IOW('b', 5, __u32)
@@ -227,6 +239,9 @@ struct binder_node_info_for_ref { · 4 unmodified lines
227239 #define BINDER_GET_NODE_DEBUG_INFO _IOWR('b', 11, struct binder_node_debug_info)
228240 #define BINDER_GET_NODE_INFO_FOR_REF _IOWR('b', 12, struct binder_node_info_for_ref)
229241 #define BINDER_SET_CONTEXT_MGR_EXT _IOW('b', 13, struct flat_binder_object)
242+#define BINDER_FREEZE _IOW('b', 14, struct binder_freeze_info)
243+#define BINDER_GET_FROZEN_INFO _IOWR('b', 15, struct binder_frozen_status_info)
244+#define BINDER_ENABLE_ONEWAY_SPAM_DETECTION _IOW('b', 16, __u32)
230245
231246 /*
232247 * NOTE: Two special error codes you should check for when calling
@@ -408,6 +423,19 @@ enum binder_driver_return_protocol { · 175 unmodified lines
408423 * The last transaction (either a bcTRANSACTION or
409424 * a bcATTEMPT_ACQUIRE) failed (e.g. out of memory). No parameters.
410425 */
426+
427+ BR_FROZEN_REPLY = _IO('r', 18),
428+ /*
429+ * The target of the last transaction (either a bcTRANSACTION or
430+ * a bcATTEMPT_ACQUIRE) is frozen. No parameters.
431+ */
432+
433+ BR_ONEWAY_SPAM_SUSPECT = _IO('r', 19),
434+ /*
435+ * Current process sent too many oneway calls to target, and the last
436+ * asynchronous transaction makes the allocated async buffer size exceed
437+ * detection threshold. No parameters.
438+ */
411439 };
412440
413441 enum binder_driver_command_protocol {
include/uapi/linux/map_to_7segment.h+0−14
@@ -1,20 +1,6 @@
11 /* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
22 /*
33 * Copyright (c) 2005 Henk Vergonet <Henk.Vergonet@gmail.com>
4− *
5− * This program is free software; you can redistribute it and/or
6− * modify it under the terms of the GNU General Public License as
7− * published by the Free Software Foundation; either version 2 of
8− * the License, or (at your option) any later version.
9− *
10− * This program is distributed in the hope that it will be useful,
11− * but WITHOUT ANY WARRANTY; without even the implied warranty of
12− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13− * GNU General Public License for more details.
14− *
15− * You should have received a copy of the GNU General Public License
16− * along with this program; if not, write to the Free Software
17− * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
184 */
195
206 #ifndef MAP_TO_7SEGMENT_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