Home Home > GIT Browse > openSUSE-15.1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-01-10 20:40:18 +0100
committerTakashi Iwai <tiwai@suse.de>2019-01-11 08:35:10 +0100
commitb00f94965b258500ca59c4ead57a5e2d29aab422 (patch)
tree1d488b866b5ce049b6d8d7370a3847d55f7edced
parentda5f0b78def2ee2b4e7936a84d22c43507094d87 (diff)
ALSA: seq: Drop unused 64bit division macros (bsc#1121278).
-rw-r--r--patches.drivers/ALSA-seq-Drop-unused-64bit-division-macros.patch53
-rw-r--r--series.conf1
2 files changed, 54 insertions, 0 deletions
diff --git a/patches.drivers/ALSA-seq-Drop-unused-64bit-division-macros.patch b/patches.drivers/ALSA-seq-Drop-unused-64bit-division-macros.patch
new file mode 100644
index 0000000000..f1324cd672
--- /dev/null
+++ b/patches.drivers/ALSA-seq-Drop-unused-64bit-division-macros.patch
@@ -0,0 +1,53 @@
+From 93ce1b12966d9d60ee5583ffbde822a22909568e Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Wed, 1 Aug 2018 16:43:56 +0200
+Subject: [PATCH] ALSA: seq: Drop unused 64bit division macros
+Git-commit: 93ce1b12966d9d60ee5583ffbde822a22909568e
+Patch-mainline: v4.19-rc1
+References: bsc#1121278
+
+The old ugly macros remained in the code without usage.
+Rip them off.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ sound/core/seq/seq_queue.h | 24 ------------------------
+ 1 file changed, 24 deletions(-)
+
+diff --git a/sound/core/seq/seq_queue.h b/sound/core/seq/seq_queue.h
+index 76db43b79a2b..e006fc8e3a36 100644
+--- a/sound/core/seq/seq_queue.h
++++ b/sound/core/seq/seq_queue.h
+@@ -109,28 +109,4 @@ int snd_seq_queue_is_used(int queueid, int client);
+
+ int snd_seq_control_queue(struct snd_seq_event *ev, int atomic, int hop);
+
+-/*
+- * 64bit division - for sync stuff..
+- */
+-#if defined(i386) || defined(i486)
+-
+-#define udiv_qrnnd(q, r, n1, n0, d) \
+- __asm__ ("divl %4" \
+- : "=a" ((u32)(q)), \
+- "=d" ((u32)(r)) \
+- : "0" ((u32)(n0)), \
+- "1" ((u32)(n1)), \
+- "rm" ((u32)(d)))
+-
+-#define u64_div(x,y,q) do {u32 __tmp; udiv_qrnnd(q, __tmp, (x)>>32, x, y);} while (0)
+-#define u64_mod(x,y,r) do {u32 __tmp; udiv_qrnnd(__tmp, q, (x)>>32, x, y);} while (0)
+-#define u64_divmod(x,y,q,r) udiv_qrnnd(q, r, (x)>>32, x, y)
+-
+-#else
+-#define u64_div(x,y,q) ((q) = (u32)((u64)(x) / (u64)(y)))
+-#define u64_mod(x,y,r) ((r) = (u32)((u64)(x) % (u64)(y)))
+-#define u64_divmod(x,y,q,r) (u64_div(x,y,q), u64_mod(x,y,r))
+-#endif
+-
+-
+ #endif
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 0018f4833b..381613835a 100644
--- a/series.conf
+++ b/series.conf
@@ -34877,6 +34877,7 @@
patches.drivers/ALSA-seq-Remove-dead-codes.patch
patches.drivers/ALSA-seq-Fix-leftovers-at-probe-error-path.patch
patches.drivers/ALSA-seq-Use-no-intrruptible-mutex_lock.patch
+ patches.drivers/ALSA-seq-Drop-unused-64bit-division-macros.patch
patches.drivers/ALSA-usb-audio-Fix-invalid-use-of-sizeof-in-parse_ua.patch
patches.drivers/ALSA-hda-realtek-Add-mute-LED-quirk-for-HP-Spectre-x.patch
patches.drivers/ALSA-hda-ca0132-Create-mmio-gpio-function-to-make-co.patch