From: Szabolcs Nagy <nsz@port70.net>
To: musl@lists.openwall.com
Subject: [PATCH 10/16] fix FIOQSIZE in arm ioctl.h
Date: Sun, 3 Jul 2016 17:07:30 +0200 [thread overview]
Message-ID: <b235c9db6aa1e3f8337a25cb2ef56b6baa98f05b.1467552244.git.nsz@port70.net> (raw)
In-Reply-To: <cover.1467552244.git.nsz@port70.net>
arm ioctl.h is the same as the generic one except this macro,
so a workaround solution is used to avoid another ioctl.h copy.
---
arch/arm/bits/ioctl_fix.h | 2 ++
arch/generic/bits/ioctl.h | 2 ++
arch/generic/bits/ioctl_fix.h | 0
3 files changed, 4 insertions(+)
create mode 100644 arch/arm/bits/ioctl_fix.h
create mode 100644 arch/generic/bits/ioctl_fix.h
diff --git a/arch/arm/bits/ioctl_fix.h b/arch/arm/bits/ioctl_fix.h
new file mode 100644
index 0000000..ebb383d
--- /dev/null
+++ b/arch/arm/bits/ioctl_fix.h
@@ -0,0 +1,2 @@
+#undef FIOQSIZE
+#define FIOQSIZE 0x545e
diff --git a/arch/generic/bits/ioctl.h b/arch/generic/bits/ioctl.h
index 649cdfc..ad5b6d6 100644
--- a/arch/generic/bits/ioctl.h
+++ b/arch/generic/bits/ioctl.h
@@ -193,3 +193,5 @@ struct winsize {
#define SIOCDEVPRIVATE 0x89F0
#define SIOCPROTOPRIVATE 0x89E0
+
+#include <bits/ioctl_fix.h>
diff --git a/arch/generic/bits/ioctl_fix.h b/arch/generic/bits/ioctl_fix.h
new file mode 100644
index 0000000..e69de29
--
2.8.1
next prev parent reply other threads:[~2016-07-03 15:07 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-03 15:01 [PATCH 00/16] sys/ioctl.h and termios.h cleanups Szabolcs Nagy
2016-07-03 15:02 ` [PATCH 01/16] use the generic ioctl.h for x86_64, x32 and aarch64 Szabolcs Nagy
2016-07-03 15:02 ` [PATCH 02/16] remove linux asm/sockios.h macros from ioctl.h Szabolcs Nagy
2016-07-03 15:03 ` [PATCH 03/16] remove ioctl macros that were removed from linux uapi Szabolcs Nagy
2016-07-03 15:03 ` [PATCH 04/16] add missing SIOCSIFNAME from linux/sockios.h to ioctl.h Szabolcs Nagy
2016-07-03 15:04 ` [PATCH 05/16] add missing TIOC* macros " Szabolcs Nagy
2016-07-03 15:05 ` [PATCH 06/16] remove mips and powerpc ioctls that are missing from linux uapi Szabolcs Nagy
2016-07-03 15:05 ` [PATCH 07/16] fix mips, mips64, mipsn32 TIOCM_* macros in ioctl.h Szabolcs Nagy
2016-07-03 15:06 ` [PATCH 08/16] fix TIOCMSET in mips ioctl.h Szabolcs Nagy
2016-07-03 15:06 ` [PATCH 09/16] remove termios2 related ioctls from sh ioctl.h Szabolcs Nagy
2016-07-03 15:07 ` Szabolcs Nagy [this message]
2016-07-03 15:07 ` [PATCH 11/16] fix generic termios.h to be more consistent with glibc Szabolcs Nagy
2016-07-03 15:08 ` [PATCH 12/16] fix powerpc " Szabolcs Nagy
2016-07-03 15:08 ` [PATCH 13/16] fix mips " Szabolcs Nagy
2016-07-03 15:09 ` [PATCH 14/16] fix TCS* definitions in mips termios.h Szabolcs Nagy
2016-07-03 15:09 ` [PATCH 15/16] fix CBAUDEX in powerpc termios.h Szabolcs Nagy
2016-07-03 15:10 ` [PATCH 16/16] fix struct termios in mips64 and mipsn32 termios.h Szabolcs Nagy
2016-07-03 19:10 ` [PATCH 00/16] sys/ioctl.h and termios.h cleanups Rich Felker
-- strict thread matches above, loose matches on Subject: below --
2016-04-10 12:09 Szabolcs Nagy
2016-04-10 12:13 ` [PATCH 10/16] fix FIOQSIZE in arm ioctl.h Szabolcs Nagy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b235c9db6aa1e3f8337a25cb2ef56b6baa98f05b.1467552244.git.nsz@port70.net \
--to=nsz@port70.net \
--cc=musl@lists.openwall.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).