[kernel] r21700 - dists/sid/linux/debian/patches/debian
Ben Hutchings
benh at moszumanska.debian.org
Thu Aug 7 15:47:12 UTC 2014
Author: benh
Date: Thu Aug 7 15:47:12 2014
New Revision: 21700
Log:
Remove bogus const-qualification of ata_host_set_n_tags() host parameter
Modified:
dists/sid/linux/debian/patches/debian/libata-avoid-abi-change-in-3.14.15.patch
Modified: dists/sid/linux/debian/patches/debian/libata-avoid-abi-change-in-3.14.15.patch
==============================================================================
--- dists/sid/linux/debian/patches/debian/libata-avoid-abi-change-in-3.14.15.patch Thu Aug 7 13:51:23 2014 (r21699)
+++ dists/sid/linux/debian/patches/debian/libata-avoid-abi-change-in-3.14.15.patch Thu Aug 7 15:47:12 2014 (r21700)
@@ -11,7 +11,7 @@
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
-@@ -175,6 +175,18 @@ static bool ata_sstatus_online(u32 sstat
+@@ -175,6 +175,17 @@ static bool ata_sstatus_online(u32 sstat
return (sstatus & 0xf) == 0x3;
}
@@ -20,8 +20,7 @@
+ return (host->flags & ATA_HOST_N_TAGS_MASK) >> ATA_HOST_N_TAGS_SHIFT;
+}
+
-+static void ata_host_set_n_tags(const struct ata_host *host,
-+ unsigned int n_tags)
++static void ata_host_set_n_tags(struct ata_host *host, unsigned int n_tags)
+{
+ host->flags = ((host->flags & ~ATA_HOST_N_TAGS_MASK) |
+ (n_tags << ATA_HOST_N_TAGS_SHIFT));
@@ -30,7 +29,7 @@
/**
* ata_link_next - link iteration helper
* @link: the previous link, NULL to start
-@@ -4798,7 +4810,7 @@ void swap_buf_le16(u16 *buf, unsigned in
+@@ -4798,7 +4809,7 @@ void swap_buf_le16(u16 *buf, unsigned in
static struct ata_queued_cmd *ata_qc_new(struct ata_port *ap)
{
struct ata_queued_cmd *qc = NULL;
@@ -39,7 +38,7 @@
unsigned int i, tag;
/* no command while frozen */
-@@ -6108,7 +6120,7 @@ void ata_host_init(struct ata_host *host
+@@ -6108,7 +6119,7 @@ void ata_host_init(struct ata_host *host
{
spin_lock_init(&host->lock);
mutex_init(&host->eh_mutex);
@@ -48,7 +47,7 @@
host->dev = dev;
host->ops = ops;
}
-@@ -6190,7 +6202,7 @@ int ata_host_register(struct ata_host *h
+@@ -6190,7 +6201,7 @@ int ata_host_register(struct ata_host *h
{
int i, rc;
More information about the Kernel-svn-changes
mailing list