]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
some 3.0 patches refreshed for fuzz
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 27 Sep 2012 23:26:36 +0000 (16:26 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 27 Sep 2012 23:26:36 +0000 (16:26 -0700)
queue-3.0/fix-a-dead-loop-in-async_synchronize_full.patch
queue-3.0/pch_uart-fix-rx-error-interrupt-setting-issue.patch

index 5cf952c519dce913f4cdb2dcd6d256412dd9bf7c..50cb9f05409f504e34ff0f22526270bc15b8dbb0 100644 (file)
@@ -51,11 +51,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  kernel/async.c |   13 +++++++++----
  1 file changed, 9 insertions(+), 4 deletions(-)
 
-diff --git a/kernel/async.c b/kernel/async.c
-index bd0c168..32d8dc9 100644
 --- a/kernel/async.c
 +++ b/kernel/async.c
-@@ -86,6 +86,13 @@ static async_cookie_t  __lowest_in_progress(struct list_head *running)
+@@ -87,6 +87,13 @@ static async_cookie_t  __lowest_in_progr
  {
        struct async_entry *entry;
  
@@ -69,7 +67,7 @@ index bd0c168..32d8dc9 100644
        if (!list_empty(running)) {
                entry = list_first_entry(running,
                        struct async_entry, list);
-@@ -236,9 +243,7 @@ EXPORT_SYMBOL_GPL(async_schedule_domain);
+@@ -236,9 +243,7 @@ EXPORT_SYMBOL_GPL(async_schedule_domain)
   */
  void async_synchronize_full(void)
  {
@@ -80,7 +78,7 @@ index bd0c168..32d8dc9 100644
  }
  EXPORT_SYMBOL_GPL(async_synchronize_full);
  
-@@ -258,7 +263,7 @@ EXPORT_SYMBOL_GPL(async_synchronize_full_domain);
+@@ -258,7 +263,7 @@ EXPORT_SYMBOL_GPL(async_synchronize_full
  /**
   * async_synchronize_cookie_domain - synchronize asynchronous function calls within a certain domain with cookie checkpointing
   * @cookie: async_cookie_t to use as checkpoint
@@ -89,6 +87,3 @@ index bd0c168..32d8dc9 100644
   *
   * This function waits until all asynchronous function calls for the
   * synchronization domain specified by the running list @list submitted
--- 
-1.7.9.5
-
index 138652ba26b807cb1e7ddf6715808f422a2e1853..639304231d68c2330d3a0473ec1b7e9fdcf84213 100644 (file)
@@ -23,7 +23,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/tty/serial/pch_uart.c
 +++ b/drivers/tty/serial/pch_uart.c
-@@ -754,7 +754,8 @@ static void pch_dma_rx_complete(void *ar
+@@ -658,7 +658,8 @@ static void pch_dma_rx_complete(void *ar
                tty_flip_buffer_push(tty);
        tty_kref_put(tty);
        async_tx_ack(priv->desc_rx);
@@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  }
  
  static void pch_dma_tx_complete(void *arg)
-@@ -809,7 +810,8 @@ static int handle_rx_to(struct eg20t_por
+@@ -713,7 +714,8 @@ static int handle_rx_to(struct eg20t_por
        int rx_size;
        int ret;
        if (!priv->start_rx) {
@@ -43,7 +43,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                return 0;
        }
        buf = &priv->rxbuf;
-@@ -1071,11 +1073,13 @@ static irqreturn_t pch_uart_interrupt(in
+@@ -975,11 +977,13 @@ static irqreturn_t pch_uart_interrupt(in
                case PCH_UART_IID_RDR:  /* Received Data Ready */
                        if (priv->use_dma) {
                                pch_uart_hal_disable_interrupt(priv,
@@ -59,7 +59,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                        } else {
                                ret = handle_rx(priv);
                        }
-@@ -1199,7 +1203,8 @@ static void pch_uart_stop_rx(struct uart
+@@ -1105,7 +1109,8 @@ static void pch_uart_stop_rx(struct uart
        struct eg20t_port *priv;
        priv = container_of(port, struct eg20t_port, port);
        priv->start_rx = 0;
@@ -69,7 +69,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        priv->int_dis_flag = 1;
  }
  
-@@ -1293,7 +1298,8 @@ static int pch_uart_startup(struct uart_
+@@ -1199,7 +1204,8 @@ static int pch_uart_startup(struct uart_
                pch_request_dma(port);
  
        priv->start_rx = 1;