History

Merge tag 'char-misc-4.18-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" char and misc driver patches for 4.18-rc1. It's not a lot of stuff here, but there are some highlights: - coreboot driver updates - soundwire driver updates - android binder updates - fpga big sync, mostly documentation - lots of minor driver updates All of these have been in linux-next for a while with no reported issues" * tag 'char-misc-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (81 commits) vmw_balloon: fixing double free when batching mode is off MAINTAINERS: Add driver-api/fpga path fpga: clarify that unregister functions also free documentation: fpga: move fpga-region.txt to driver-api documentation: fpga: add bridge document to driver-api documentation: fpga: move fpga-mgr.txt to driver-api Documentation: fpga: move fpga overview to driver-api fpga: region: kernel-doc fixes fpga: bridge: kernel-doc fixes fpga: mgr: kernel-doc fixes fpga: use SPDX fpga: region: change api, add fpga_region_create/free fpga: bridge: change api, don't use drvdata fpga: manager: change api, don't use drvdata fpga: region: don't use drvdata in common fpga code Drivers: hv: vmbus: Removed an unnecessary cast from void * ver_linux: Drop redundant calls to system() to test if file is readable ver_linux: Move stderr redirection from function parameter to function body misc: IBM Virtual Management Channel Driver (VMC) rpmsg: Correct support for MODULE_DEVICE_TABLE() ...

Linus Torvalds committed 8 years ago

Commit abf7dba2 parents 07c4dd3 b23220f132 files · +8981 −1234Browse files

Showing the changes to scripts (3 of 132 files). Show all

Unified · Split

3 files
  1. scripts/mod/devicetable-offsets.c +3 −0
  2. scripts/mod/file2alias.c +11 −0
  3. scripts/ver_linux +38 −43
scripts/mod/devicetable-offsets.c+3−0
@@ -139,6 +139,9 @@ int main(void) · 138 unmodified lines
139139 DEVID(hv_vmbus_device_id);
140140 DEVID_FIELD(hv_vmbus_device_id, guid);
141141
142+ DEVID(rpmsg_device_id);
143+ DEVID_FIELD(rpmsg_device_id, name);
144+
142145 DEVID(i2c_device_id);
143146 DEVID_FIELD(i2c_device_id, name);
144147
scripts/mod/file2alias.c+11−0
@@ -944,6 +944,17 @@ static int do_vmbus_entry(const char *filename, void *symval, · 943 unmodified lines
944944 }
945945 ADD_TO_DEVTABLE("vmbus", hv_vmbus_device_id, do_vmbus_entry);
946946
947+/* Looks like: rpmsg:S */
948+static int do_rpmsg_entry(const char *filename, void *symval,
949+ char *alias)
950+{
951+ DEF_FIELD_ADDR(symval, rpmsg_device_id, name);
952+ sprintf(alias, RPMSG_DEVICE_MODALIAS_FMT, *name);
953+
954+ return 1;
955+}
956+ADD_TO_DEVTABLE("rpmsg", rpmsg_device_id, do_rpmsg_entry);
957+
947958 /* Looks like: i2c:S */
948959 static int do_i2c_entry(const char *filename, void *symval,
949960 char *alias)
scripts/ver_linux+38−43
@@ -13,36 +13,34 @@ BEGIN { · 12 unmodified lines
1313 system("uname -a")
1414 printf("\n")
1515
16− printversion("GNU C", version("gcc -dumpversion 2>&1"))
17− printversion("GNU Make", version("make --version 2>&1"))
18− printversion("Binutils", version("ld -v 2>&1"))
19− printversion("Util-linux", version("mount --version 2>&1"))
20− printversion("Mount", version("mount --version 2>&1"))
21− printversion("Module-init-tools", version("depmod -V 2>&1"))
22− printversion("E2fsprogs", version("tune2fs 2>&1"))
23− printversion("Jfsutils", version("fsck.jfs -V 2>&1"))
24− printversion("Reiserfsprogs", version("reiserfsck -V 2>&1"))
25− printversion("Reiser4fsprogs", version("fsck.reiser4 -V 2>&1"))
26− printversion("Xfsprogs", version("xfs_db -V 2>&1"))
27− printversion("Pcmciautils", version("pccardctl -V 2>&1"))
28− printversion("Pcmcia-cs", version("cardmgr -V 2>&1"))
29− printversion("Quota-tools", version("quota -V 2>&1"))
30− printversion("PPP", version("pppd --version 2>&1"))
31− printversion("Isdn4k-utils", version("isdnctrl 2>&1"))
32− printversion("Nfs-utils", version("showmount --version 2>&1"))
16+ printversion("GNU C", version("gcc -dumpversion"))
17+ printversion("GNU Make", version("make --version"))
18+ printversion("Binutils", version("ld -v"))
19+ printversion("Util-linux", version("mount --version"))
20+ printversion("Mount", version("mount --version"))
21+ printversion("Module-init-tools", version("depmod -V"))
22+ printversion("E2fsprogs", version("tune2fs"))
23+ printversion("Jfsutils", version("fsck.jfs -V"))
24+ printversion("Reiserfsprogs", version("reiserfsck -V"))
25+ printversion("Reiser4fsprogs", version("fsck.reiser4 -V"))
26+ printversion("Xfsprogs", version("xfs_db -V"))
27+ printversion("Pcmciautils", version("pccardctl -V"))
28+ printversion("Pcmcia-cs", version("cardmgr -V"))
29+ printversion("Quota-tools", version("quota -V"))
30+ printversion("PPP", version("pppd --version"))
31+ printversion("Isdn4k-utils", version("isdnctrl"))
32+ printversion("Nfs-utils", version("showmount --version"))
3333
34− if (system("test -r /proc/self/maps") == 0) {
35− while (getline <"/proc/self/maps" > 0) {
36− n = split($0, procmaps, "/")
37− if (/libc.*so$/ && match(procmaps[n], /[0-9]+([.]?[0-9]+)+/)) {
38− ver = substr(procmaps[n], RSTART, RLENGTH)
39− printversion("Linux C Library", ver)
40− break
41− }
34+ while (getline <"/proc/self/maps" > 0) {
35+ n = split($0, procmaps, "/")
36+ if (/libc.*so$/ && match(procmaps[n], /[0-9]+([.]?[0-9]+)+/)) {
37+ ver = substr(procmaps[n], RSTART, RLENGTH)
38+ printversion("Linux C Library", ver)
39+ break
4240 }
4341 }
4442
45− printversion("Dynamic linker (ldd)", version("ldd --version 2>&1"))
43+ printversion("Dynamic linker (ldd)", version("ldd --version"))
4644
4745 while ("ldconfig -p 2>/dev/null" | getline > 0) {
4846 if (/(libg|stdc)[+]+\.so/) {
@@ -50,28 +48,25 @@ BEGIN { · 1 unmodified line
5048 break
5149 }
5250 }
53− if (system("test -r " libcpp) == 0)
54− printversion("Linux C++ Library", version("readlink " libcpp))
55−
56− printversion("Procps", version("ps --version 2>&1"))
57− printversion("Net-tools", version("ifconfig --version 2>&1"))
58− printversion("Kbd", version("loadkeys -V 2>&1"))
59− printversion("Console-tools", version("loadkeys -V 2>&1"))
60− printversion("Oprofile", version("oprofiled --version 2>&1"))
61− printversion("Sh-utils", version("expr --v 2>&1"))
62− printversion("Udev", version("udevadm --version 2>&1"))
63− printversion("Wireless-tools", version("iwconfig --version 2>&1"))
51+ printversion("Linux C++ Library", version("readlink " libcpp))
52+ printversion("Procps", version("ps --version"))
53+ printversion("Net-tools", version("ifconfig --version"))
54+ printversion("Kbd", version("loadkeys -V"))
55+ printversion("Console-tools", version("loadkeys -V"))
56+ printversion("Oprofile", version("oprofiled --version"))
57+ printversion("Sh-utils", version("expr --v"))
58+ printversion("Udev", version("udevadm --version"))
59+ printversion("Wireless-tools", version("iwconfig --version"))
6460
65− if (system("test -r /proc/modules") == 0) {
66− while ("sort /proc/modules" | getline > 0) {
67− mods = mods sep $1
68− sep = " "
69− }
70− printversion("Modules Loaded", mods)
61+ while ("sort /proc/modules" | getline > 0) {
62+ mods = mods sep $1
63+ sep = " "
7164 }
65+ printversion("Modules Loaded", mods)
7266 }
7367
7468 function version(cmd, ver) {
69+ cmd = cmd " 2>&1"
7570 while (cmd | getline > 0) {
7671 if (!/ver_linux/ && match($0, /[0-9]+([.]?[0-9]+)+/)) {
7772 ver = substr($0, RSTART, RLENGTH)

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