From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/14203 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Petr Vorel Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH 1/1] fix mt_fileno and mt_fileno struct mtget members on mips{,n32} Date: Fri, 7 Jun 2019 08:53:12 +0200 Message-ID: <20190607065312.4445-1-petr.vorel@gmail.com> Reply-To: musl@lists.openwall.com Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="145998"; mail-complaints-to="usenet@blaine.gmane.org" Cc: Petr Vorel To: musl@lists.openwall.com Original-X-From: musl-return-14219-gllmg-musl=m.gmane.org@lists.openwall.com Fri Jun 07 08:53:34 2019 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.89) (envelope-from ) id 1hZ8kn-000bt2-FG for gllmg-musl@m.gmane.org; Fri, 07 Jun 2019 08:53:33 +0200 Original-Received: (qmail 29717 invoked by uid 550); 7 Jun 2019 06:53:30 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 28660 invoked from network); 7 Jun 2019 06:53:30 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=HrrNcVIDjzaNc4YTBRMYJsRRtKZxZ1Ve9/D1AO/k3As=; b=O2ZNmIuYM/u3A9E8t35AtIkmMg3uflLDGdOo7mtqyHgU7+/n9VrpsrSAGIksw+G6rF +3O7VUNoP8318isTMm8GYUjr9EYz+zh8coMl2SJYGHqSBp1JlmPep40e+ndpyGCod5qv K2WGjxGawX6ciN+dJesNXie/yISJkfBW7HPh7O1MYRYfjqYtpSEOnL7Q9E5trGQtIeek uDZk9AiblICCoZiZJ8T3P52oS0CPbhqK2v9OnlQQ5J+JrWbGraJ36qlrk/4WLNmoUt3o 2ZrEoV6+bvqyWVxd2/z/jhcfhx/89M0koZvHrzF6Xp7rJcoQfwKapTL6FHx4G3rvoJnv IaaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=HrrNcVIDjzaNc4YTBRMYJsRRtKZxZ1Ve9/D1AO/k3As=; b=X2HgDHOdHDqdxy4gb7O8YEtRJyOeIx4yrpkO5u5EAH87BbJ/p0+OTjnP21gqrBXIdk EqsrldLGYTt1Km+E151bvxryJ/i/Cg3znhwxpJesERxT2rFE/AgzVhJl3zp3BzRNA5Rx 249g5mdyBeVwYysIs9+TyEZvtOSNbyHD0PJWDBP4fZsh6oZxNG0tWBclusZdgxu6lw8G 1k5aZA/jFIkddsaN7lOQr2LA2o2Zj2bUGhYp1kpDXgj2Ri7fJKLJm4yjCBU0SRQaUerx NuMiKOYEqvH99X6oNgSC8SaZ2Y3tmNBnuXWrdprnTm5GNe6ILDoZiSy4IKspN3/0A5QJ LCuQ== X-Gm-Message-State: APjAAAVGo5cgvMeKWgX3rSBGKoKexz01QIIaug2/5zjXJL986ZEUIejt I04G2f1ZZPAQhFzWTXP3VSQ95cj1 X-Google-Smtp-Source: APXvYqzBeKwmqyDhob9Tqo+UR77GSdaYxSdJlHJ3IgCf6taWd4j5rAz2pdyjEpj1bgPxBkJ03Gl7hw== X-Received: by 2002:a50:b48f:: with SMTP id w15mr7313865edd.260.1559890398345; Thu, 06 Jun 2019 23:53:18 -0700 (PDT) X-Mailer: git-send-email 2.21.0 Xref: news.gmane.org gmane.linux.lib.musl.general:14203 Archived-At: These are defined in kernel sources as daddr_t, which is for mips (and sparc which we don't support) defined as long. Other archs define it as int. Signed-off-by: Petr Vorel --- arch/generic/bits/mtio.h | 9 +++++++++ arch/mips/bits/mtio.h | 9 +++++++++ arch/mipsn32/bits/mtio.h | 9 +++++++++ include/sys/mtio.h | 12 ++---------- 4 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 arch/generic/bits/mtio.h create mode 100644 arch/mips/bits/mtio.h create mode 100644 arch/mipsn32/bits/mtio.h diff --git a/arch/generic/bits/mtio.h b/arch/generic/bits/mtio.h new file mode 100644 index 00000000..3901eaf2 --- /dev/null +++ b/arch/generic/bits/mtio.h @@ -0,0 +1,9 @@ +struct mtget { + long mt_type; + long mt_resid; + long mt_dsreg; + long mt_gstat; + long mt_erreg; + int mt_fileno; + int mt_blkno; +}; diff --git a/arch/mips/bits/mtio.h b/arch/mips/bits/mtio.h new file mode 100644 index 00000000..ee0073ff --- /dev/null +++ b/arch/mips/bits/mtio.h @@ -0,0 +1,9 @@ +struct mtget { + long mt_type; + long mt_resid; + long mt_dsreg; + long mt_gstat; + long mt_erreg; + long mt_fileno; + long mt_blkno; +}; diff --git a/arch/mipsn32/bits/mtio.h b/arch/mipsn32/bits/mtio.h new file mode 100644 index 00000000..ee0073ff --- /dev/null +++ b/arch/mipsn32/bits/mtio.h @@ -0,0 +1,9 @@ +struct mtget { + long mt_type; + long mt_resid; + long mt_dsreg; + long mt_gstat; + long mt_erreg; + long mt_fileno; + long mt_blkno; +}; diff --git a/include/sys/mtio.h b/include/sys/mtio.h index f16a529b..ca995fa9 100644 --- a/include/sys/mtio.h +++ b/include/sys/mtio.h @@ -4,6 +4,8 @@ #include #include +#include + struct mtop { short mt_op; int mt_count; @@ -48,16 +50,6 @@ struct mtop { #define MTSETPART 33 #define MTMKPART 34 -struct mtget { - long mt_type; - long mt_resid; - long mt_dsreg; - long mt_gstat; - long mt_erreg; - int mt_fileno; - int mt_blkno; -}; - #define MT_ISUNKNOWN 0x01 #define MT_ISQIC02 0x02 #define MT_ISWT5150 0x03 -- 2.21.0