Linux v3.14-rc2-267-g9398a10
This commit is contained in:
Josh Boyer
parent
7845789edd
commit
ceb6aca5ab
@ -1,94 +0,0 @@
|
|||||||
|
|
||||||
Delivered-To: jwboyer@gmail.com
|
|
||||||
Received: by 10.76.27.197 with SMTP id v5csp83078oag;
|
|
||||||
Sun, 26 Jan 2014 17:55:49 -0800 (PST)
|
|
||||||
X-Received: by 10.68.185.1 with SMTP id ey1mr13619314pbc.33.1390787749474;
|
|
||||||
Sun, 26 Jan 2014 17:55:49 -0800 (PST)
|
|
||||||
Return-Path: <sujith@msujith.org>
|
|
||||||
Received: from bastion.fedoraproject.org (bastion02.fedoraproject.org. [209.132.181.3])
|
|
||||||
by mx.google.com with ESMTP id va10si9336344pbc.158.2014.01.26.17.55.49
|
|
||||||
for <jwboyer@gmail.com>;
|
|
||||||
Sun, 26 Jan 2014 17:55:49 -0800 (PST)
|
|
||||||
Received-SPF: neutral (google.com: 209.132.181.3 is neither permitted nor denied by best guess record for domain of sujith@msujith.org) client-ip=209.132.181.3;
|
|
||||||
Authentication-Results: mx.google.com;
|
|
||||||
spf=neutral (google.com: 209.132.181.3 is neither permitted nor denied by best guess record for domain of sujith@msujith.org) smtp.mail=sujith@msujith.org
|
|
||||||
Received: by bastion02.phx2.fedoraproject.org (Postfix)
|
|
||||||
id B18E24013F; Mon, 27 Jan 2014 01:55:48 +0000 (UTC)
|
|
||||||
Delivered-To: jwboyer@fedoraproject.org
|
|
||||||
Received: from mx1.redhat.com (ext-mx11.extmail.prod.ext.phx2.redhat.com [10.5.110.16])
|
|
||||||
by bastion02.phx2.fedoraproject.org (Postfix) with ESMTP id A0C3240135
|
|
||||||
for <jwboyer@fedoraproject.org>; Mon, 27 Jan 2014 01:55:47 +0000 (UTC)
|
|
||||||
Received: from s72.web-hosting.com (s72.web-hosting.com [198.187.29.21])
|
|
||||||
by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0R1tk44009597
|
|
||||||
for <jwboyer@fedoraproject.org>; Sun, 26 Jan 2014 20:55:46 -0500
|
|
||||||
Received: from [117.199.138.156] (port=33797 helo=nako)
|
|
||||||
by server72.web-hosting.com with esmtpsa (UNKNOWN:AES128-GCM-SHA256:128)
|
|
||||||
(Exim 4.80.1)
|
|
||||||
(envelope-from <sujith@msujith.org>)
|
|
||||||
id 1W7bQI-000GgL-Md; Sun, 26 Jan 2014 20:55:39 -0500
|
|
||||||
From: Sujith Manoharan <sujith@msujith.org>
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=us-ascii
|
|
||||||
Content-Transfer-Encoding: 7bit
|
|
||||||
Message-ID: <21221.47960.726835.615315@gargle.gargle.HOWL>
|
|
||||||
Date: Mon, 27 Jan 2014 07:20:16 +0530
|
|
||||||
To: Josh Boyer <jwboyer@fedoraproject.org>
|
|
||||||
Cc: "John W. Linville" <linville@tuxdriver.com>,
|
|
||||||
<ath9k-devel@venema.h4ckr.net>, netdev <netdev@vger.kernel.org>,
|
|
||||||
"Linux-Kernel\@Vger. Kernel. Org" <linux-kernel@vger.kernel.org>
|
|
||||||
Subject: Re: ath9k ARM build error with v3.13-8330-g4ba9920
|
|
||||||
In-Reply-To: <CA+5PVA4fnCo8anT0HZCVu4+AFAseibm=0yD8nL3Lm7Q5dA-qZQ@mail.gmail.com>
|
|
||||||
References: <CA+5PVA4fnCo8anT0HZCVu4+AFAseibm=0yD8nL3Lm7Q5dA-qZQ@mail.gmail.com>
|
|
||||||
X-Mailer: VM 8.2.0b under 24.3.50.1 (x86_64-unknown-linux-gnu)
|
|
||||||
X-AntiAbuse: This header was added to track abuse, please include it with any abuse report
|
|
||||||
X-AntiAbuse: Primary Hostname - server72.web-hosting.com
|
|
||||||
X-AntiAbuse: Original Domain - fedoraproject.org
|
|
||||||
X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
|
|
||||||
X-AntiAbuse: Sender Address Domain - msujith.org
|
|
||||||
X-Get-Message-Sender-Via: server72.web-hosting.com: authenticated_id: sujith@msujith.org
|
|
||||||
X-Source:
|
|
||||||
X-Source-Args:
|
|
||||||
X-Source-Dir:
|
|
||||||
X-RedHat-Spam-Score: -1.9 (BAYES_00)
|
|
||||||
X-Scanned-By: MIMEDefang 2.68 on 10.5.110.16
|
|
||||||
|
|
||||||
Josh Boyer wrote:
|
|
||||||
> adds a udelay(10000) call to the ath9k driver. This will cause a
|
|
||||||
> build error on various ARM configs because the value passed to udelay
|
|
||||||
> is too large:
|
|
||||||
>
|
|
||||||
> ERROR: "__bad_udelay" [drivers/net/wireless/ath/ath9k/ath9k_hw.ko] undefined!
|
|
||||||
> make[1]: *** [__modpost] Error 1
|
|
||||||
> make: *** [modules] Error 2
|
|
||||||
>
|
|
||||||
> Is the 10000 microsecond udelay really required? I believe the limit
|
|
||||||
> on ARM is 2000. Perhaps something else could be done in this case?
|
|
||||||
|
|
||||||
The delay is a workaround for a HW issue. Does this patch fix the problem ?
|
|
||||||
|
|
||||||
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
|
|
||||||
index fbf43c0..11eab9f 100644
|
|
||||||
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
|
||||||
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
|
||||||
@@ -1316,7 +1316,7 @@ static bool ath9k_hw_set_reset(struct ath_hw *ah, int type)
|
|
||||||
if (AR_SREV_9300_20_OR_LATER(ah))
|
|
||||||
udelay(50);
|
|
||||||
else if (AR_SREV_9100(ah))
|
|
||||||
- udelay(10000);
|
|
||||||
+ mdelay(10);
|
|
||||||
else
|
|
||||||
udelay(100);
|
|
||||||
|
|
||||||
@@ -2051,9 +2051,8 @@ static bool ath9k_hw_set_power_awake(struct ath_hw *ah)
|
|
||||||
|
|
||||||
REG_SET_BIT(ah, AR_RTC_FORCE_WAKE,
|
|
||||||
AR_RTC_FORCE_WAKE_EN);
|
|
||||||
-
|
|
||||||
if (AR_SREV_9100(ah))
|
|
||||||
- udelay(10000);
|
|
||||||
+ mdelay(10);
|
|
||||||
else
|
|
||||||
udelay(50);
|
|
||||||
|
|
||||||
|
|
||||||
Sujith
|
|
||||||
@ -1754,6 +1754,7 @@ CONFIG_RT73USB=m
|
|||||||
CONFIG_RTL8180=m
|
CONFIG_RTL8180=m
|
||||||
CONFIG_RTL8187=m
|
CONFIG_RTL8187=m
|
||||||
# CONFIG_USB_ZD1201 is not set
|
# CONFIG_USB_ZD1201 is not set
|
||||||
|
# CONFIG_USB_NET_SR9800 is not set
|
||||||
CONFIG_USB_NET_RNDIS_WLAN=m
|
CONFIG_USB_NET_RNDIS_WLAN=m
|
||||||
CONFIG_USB_NET_KALMIA=m
|
CONFIG_USB_NET_KALMIA=m
|
||||||
CONFIG_USB_NET_QMI_WWAN=m
|
CONFIG_USB_NET_QMI_WWAN=m
|
||||||
|
|||||||
@ -1,104 +0,0 @@
|
|||||||
|
|
||||||
Delivered-To: jwboyer@gmail.com
|
|
||||||
Received: by 10.76.27.197 with SMTP id v5csp80417oag;
|
|
||||||
Thu, 30 Jan 2014 22:14:25 -0800 (PST)
|
|
||||||
X-Received: by 10.67.8.102 with SMTP id dj6mr18890418pad.10.1391148865030;
|
|
||||||
Thu, 30 Jan 2014 22:14:25 -0800 (PST)
|
|
||||||
Return-Path: <sachin.kamat@linaro.org>
|
|
||||||
Received: from bastion.fedoraproject.org (bastion02.fedoraproject.org. [209.132.181.3])
|
|
||||||
by mx.google.com with ESMTP id ui8si9189230pac.148.2014.01.30.22.14.24
|
|
||||||
for <jwboyer@gmail.com>;
|
|
||||||
Thu, 30 Jan 2014 22:14:25 -0800 (PST)
|
|
||||||
Received-SPF: neutral (google.com: 209.132.181.3 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.132.181.3;
|
|
||||||
Authentication-Results: mx.google.com;
|
|
||||||
spf=neutral (google.com: 209.132.181.3 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org
|
|
||||||
Received: by bastion02.phx2.fedoraproject.org (Postfix)
|
|
||||||
id 4AC1340335; Fri, 31 Jan 2014 06:14:24 +0000 (UTC)
|
|
||||||
Delivered-To: jwboyer@fedoraproject.org
|
|
||||||
Received: from mx1.redhat.com (ext-mx14.extmail.prod.ext.phx2.redhat.com [10.5.110.19])
|
|
||||||
by bastion02.phx2.fedoraproject.org (Postfix) with ESMTP id 9B3D740215
|
|
||||||
for <jwboyer@fedoraproject.org>; Fri, 31 Jan 2014 06:14:23 +0000 (UTC)
|
|
||||||
Received: from mail-pb0-f48.google.com (mail-pb0-f48.google.com [209.85.160.48])
|
|
||||||
by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0V6EM4n000397
|
|
||||||
for <jwboyer@fedoraproject.org>; Fri, 31 Jan 2014 01:14:22 -0500
|
|
||||||
Received: by mail-pb0-f48.google.com with SMTP id rr13so4032576pbb.21
|
|
||||||
for <jwboyer@fedoraproject.org>; Thu, 30 Jan 2014 22:14:22 -0800 (PST)
|
|
||||||
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
|
||||||
d=1e100.net; s=20130820;
|
|
||||||
h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version
|
|
||||||
:content-type:content-transfer-encoding;
|
|
||||||
bh=BGRkmAtr6oCuCVzH3/VAO4vZHPWjXG3HvWVgh3iYoyc=;
|
|
||||||
b=BV8FNC6/36vQ7hzewqa1KDU2eZ5djh+grZwutUPwJvgdFm9Unvryca/uZ10/pYNbtR
|
|
||||||
fh2+Zd0EnkUdtzeZbpNKm4NyEhs41JxVAP4Qda7ySJDwQ/plJLdFMD3HJhrV3s8nLbK0
|
|
||||||
bqbYK2daVba2fuZkU3dR31JB4rRHo1mSKjgjM+5BnhbVswUE4Dr+6qa7hcQP2kKFzfSQ
|
|
||||||
PM1t2bWEt95Tas4qSt3LJpKb9nyibCKS2JuOcj9Efimu5UwxSNtRd4wkzBA2jR3S+HmG
|
|
||||||
Ev1TK17AmVEu7KeXFo2GR2IXyBss+qlov3L9IkaswFgDQdpDQFL/uyQJtBNSZjoESeSJ
|
|
||||||
f/Ow==
|
|
||||||
X-Gm-Message-State: ALoCoQnV+4N5+WjFdFY1kKQz4MFAPtjWuLYpCVMRAOMT17Na1YgH48TOQoz14TivrxYcSpWzRgTO
|
|
||||||
X-Received: by 10.68.191.73 with SMTP id gw9mr18958285pbc.158.1391148862198;
|
|
||||||
Thu, 30 Jan 2014 22:14:22 -0800 (PST)
|
|
||||||
Received: from linaro.sisodomain.com ([115.113.119.130])
|
|
||||||
by mx.google.com with ESMTPSA id nu10sm23776585pbb.16.2014.01.30.22.14.18
|
|
||||||
for <multiple recipients>
|
|
||||||
(version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
|
|
||||||
Thu, 30 Jan 2014 22:14:21 -0800 (PST)
|
|
||||||
From: Sachin Kamat <sachin.kamat@linaro.org>
|
|
||||||
To: dri-devel@lists.freedesktop.org
|
|
||||||
Cc: inki.dae@samsung.com, jy0922.shim@samsung.com, sw0312.kim@samsung.com,
|
|
||||||
airlied@linux.ie, rahul.sharma@samsung.com, jwboyer@fedoraproject.org,
|
|
||||||
sachin.kamat@linaro.org, patches@linaro.org
|
|
||||||
Subject: [PATCH 1/1] drm/exynos: Fix build error in exynos_hdmi.c
|
|
||||||
Date: Fri, 31 Jan 2014 11:39:32 +0530
|
|
||||||
Message-Id: <1391148572-24130-1-git-send-email-sachin.kamat@linaro.org>
|
|
||||||
X-Mailer: git-send-email 1.7.9.5
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
X-RedHat-Spam-Score: -3.001 (BAYES_00,DCC_REPUT_00_12,RCVD_IN_DNSWL_LOW,SPF_PASS)
|
|
||||||
X-Scanned-By: MIMEDefang 2.68 on 10.5.110.19
|
|
||||||
|
|
||||||
‘hdmi_infoframe’ is already defined in include/linux/hdmi.h.
|
|
||||||
Rename the local variable to avoid the following build error:
|
|
||||||
drivers/gpu/drm/exynos/exynos_hdmi.c:382:8: error: ‘hdmi_infoframe’ defined as wrong kind of tag
|
|
||||||
struct hdmi_infoframe {
|
|
||||||
|
|
||||||
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
|
|
||||||
Reported-by: Josh Boyer <jwboyer@fedoraproject.org>
|
|
||||||
---
|
|
||||||
drivers/gpu/drm/exynos/exynos_hdmi.c | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
|
|
||||||
index a0e10ae..0d4407c 100644
|
|
||||||
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
|
|
||||||
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
|
|
||||||
@@ -379,7 +379,7 @@ static const struct hdmiphy_config hdmiphy_v14_configs[] = {
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
-struct hdmi_infoframe {
|
|
||||||
+struct hdmi_frameinfo {
|
|
||||||
enum HDMI_PACKET_TYPE type;
|
|
||||||
u8 ver;
|
|
||||||
u8 len;
|
|
||||||
@@ -682,7 +682,7 @@ static u8 hdmi_chksum(struct hdmi_context *hdata,
|
|
||||||
}
|
|
||||||
|
|
||||||
static void hdmi_reg_infoframe(struct hdmi_context *hdata,
|
|
||||||
- struct hdmi_infoframe *infoframe)
|
|
||||||
+ struct hdmi_frameinfo *infoframe)
|
|
||||||
{
|
|
||||||
u32 hdr_sum;
|
|
||||||
u8 chksum;
|
|
||||||
@@ -985,7 +985,7 @@ static void hdmi_conf_reset(struct hdmi_context *hdata)
|
|
||||||
|
|
||||||
static void hdmi_conf_init(struct hdmi_context *hdata)
|
|
||||||
{
|
|
||||||
- struct hdmi_infoframe infoframe;
|
|
||||||
+ struct hdmi_frameinfo infoframe;
|
|
||||||
|
|
||||||
/* disable HPD interrupts from HDMI IP block, use GPIO instead */
|
|
||||||
hdmi_reg_writemask(hdata, HDMI_INTC_CON, 0, HDMI_INTC_EN_GLOBAL |
|
|
||||||
--
|
|
||||||
1.7.9.5
|
|
||||||
|
|
||||||
11
kernel.spec
11
kernel.spec
@ -61,7 +61,7 @@ Summary: The Linux kernel
|
|||||||
# The rc snapshot level
|
# The rc snapshot level
|
||||||
%define rcrev 2
|
%define rcrev 2
|
||||||
# The git snapshot level
|
# The git snapshot level
|
||||||
%define gitrev 1
|
%define gitrev 2
|
||||||
# Set rpm version accordingly
|
# Set rpm version accordingly
|
||||||
%define rpmversion 3.%{upstream_sublevel}.0
|
%define rpmversion 3.%{upstream_sublevel}.0
|
||||||
%endif
|
%endif
|
||||||
@ -621,10 +621,7 @@ Patch25128: dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch
|
|||||||
#rhbz 1057529
|
#rhbz 1057529
|
||||||
Patch25188: 0001-usb-phy-Quiet-unable-to-find-transceiver-message.patch
|
Patch25188: 0001-usb-phy-Quiet-unable-to-find-transceiver-message.patch
|
||||||
|
|
||||||
Patch25189: ath9k-fix-bad-udelay.patch
|
|
||||||
|
|
||||||
Patch25192: imx-hdmi-fix.patch
|
Patch25192: imx-hdmi-fix.patch
|
||||||
Patch25193: fix-exynos-hdmi-build.patch
|
|
||||||
|
|
||||||
#rhbz 1031296
|
#rhbz 1031296
|
||||||
Patch25194: tick-Clear-broadcast-pending-bit-when-switching-to-oneshot.patch
|
Patch25194: tick-Clear-broadcast-pending-bit-when-switching-to-oneshot.patch
|
||||||
@ -1275,10 +1272,7 @@ ApplyPatch dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch
|
|||||||
# rhbz 1057529
|
# rhbz 1057529
|
||||||
ApplyPatch 0001-usb-phy-Quiet-unable-to-find-transceiver-message.patch
|
ApplyPatch 0001-usb-phy-Quiet-unable-to-find-transceiver-message.patch
|
||||||
|
|
||||||
ApplyPatch ath9k-fix-bad-udelay.patch
|
|
||||||
|
|
||||||
ApplyPatch imx-hdmi-fix.patch
|
ApplyPatch imx-hdmi-fix.patch
|
||||||
ApplyPatch fix-exynos-hdmi-build.patch
|
|
||||||
|
|
||||||
#rhbz 1031296
|
#rhbz 1031296
|
||||||
ApplyPatch tick-Clear-broadcast-pending-bit-when-switching-to-oneshot.patch
|
ApplyPatch tick-Clear-broadcast-pending-bit-when-switching-to-oneshot.patch
|
||||||
@ -2065,6 +2059,9 @@ fi
|
|||||||
# ||----w |
|
# ||----w |
|
||||||
# || ||
|
# || ||
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Feb 12 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc2.git2.1
|
||||||
|
- Linux v3.14-rc2-267-g9398a10
|
||||||
|
|
||||||
* Wed Feb 12 2014 Josh Boyer <jwboyer@fedoraproject.org>
|
* Wed Feb 12 2014 Josh Boyer <jwboyer@fedoraproject.org>
|
||||||
- Fix cgroup destroy oops (rhbz 1045755)
|
- Fix cgroup destroy oops (rhbz 1045755)
|
||||||
- Fix backtrace in amd_e400_idle (rhbz 1031296)
|
- Fix backtrace in amd_e400_idle (rhbz 1031296)
|
||||||
|
|||||||
2
sources
2
sources
@ -1,4 +1,4 @@
|
|||||||
0ecbaf65c00374eb4a826c2f9f37606f linux-3.13.tar.xz
|
0ecbaf65c00374eb4a826c2f9f37606f linux-3.13.tar.xz
|
||||||
732d1952898b28d5ccc264cad77b0619 perf-man-3.13.tar.gz
|
732d1952898b28d5ccc264cad77b0619 perf-man-3.13.tar.gz
|
||||||
8a746bf23f7c5c3a2f46eb649ab69fde patch-3.14-rc2.xz
|
8a746bf23f7c5c3a2f46eb649ab69fde patch-3.14-rc2.xz
|
||||||
2b1a7642afbea3b4f65b6137f6b499db patch-3.14-rc2-git1.xz
|
a658d09ff62db0ad3b8074cfc53a0412 patch-3.14-rc2-git2.xz
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user